[PATCH] Don't output 'Automatic merge failed, ...'

git-merge.sh does this for us.

Signed-off-by: Fredrik Kuivinen <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 145a5cf0d1fccc8ed6a18be4ae92af5e9cebe779..eeb3d24da8224a2275513918480c0b7866dfbe01 100755 (executable)
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -423,5 +423,4 @@ except:
 if clean:
     sys.exit(0)
 else:
-    print 'Automatic merge failed, fix up by hand'
     sys.exit(1)