only git fetch should be non-fatal, merge errors still need to be caught
authorSarah Hoffmann <lonvia@denofr.de>
Sat, 21 Sep 2013 08:11:22 +0000 (10:11 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Sat, 21 Sep 2013 08:11:22 +0000 (10:11 +0200)
commit6131b08d957d6808a57ba6647e5e60a057ee1e5a
tree7322225419c66692036fef2dfb29bd4900bb44c9
parentddc3ef7fe89b9e5773d82f129931ed374a19f5d5
only git fetch should be non-fatal, merge errors still need to be caught
cookbooks/nominatim/templates/default/updater.erb