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

git-merge.sh does this for us. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
git-mirror · Sep 13, 2005 · 0d214b6 · 0d214b6
1 parent d9a23fa
commit 0d214b6
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/git-merge-recursive.py b/git-merge-recursive.py
@@ -423,5 +423,4 @@ def usage():
 if clean:
     sys.exit(0)
 else:
-    print 'Automatic merge failed, fix up by hand'
     sys.exit(1)