From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 21 Sep 2013 08:11:22 +0000 (+0200)
Subject: only git fetch should be non-fatal, merge errors still need to be caught
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/6131b08d957d6808a57ba6647e5e60a057ee1e5a?hp=6131b08d957d6808a57ba6647e5e60a057ee1e5a

only git fetch should be non-fatal, merge errors still need to be caught
---