tree fbbf206cf8f8a9db5aec9cad8c28a2908fe271e1
parent f241ff0d0a9ddb84b2f673a1b7a92fea0d6add3a
author Johannes Schindelin <johannes.schindelin@gmx.de> 1469549167 +0200
committer Junio C Hamano <gitster@pobox.com> 1469556824 -0700

merge_recursive: abort properly upon errors

There are a couple of places where return values never indicated errors
before, as we simply died instead of returning.

But now negative return values mean that there was an error and we have to
abort the operation. Let's do exactly that.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>