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

[git.git] / git-merge-recursive.py

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 145a5cf..eeb3d24 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)