From 0d214b6619bf14a6409a2a1ba079f3530d40ee41 Mon Sep 17 00:00:00 2001 From: Fredrik Kuivinen Date: Tue, 13 Sep 2005 23:40:23 +0200 Subject: [PATCH] Don't output 'Automatic merge failed, ...' git-merge.sh does this for us. Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano --- git-merge-recursive.py | 1 - 1 file changed, 1 deletion(-) diff --git a/git-merge-recursive.py b/git-merge-recursive.py index 145a5cf0d1..eeb3d24da8 100755 --- 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) -- cgit v1.2.3