From: Fredrik Kuivinen Date: Tue, 13 Sep 2005 21:40:23 +0000 (+0200) Subject: [PATCH] Don't output 'Automatic merge failed, ...' X-Git-Tag: v0.99.7~50 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0d214b6619bf14a6409a2a1ba079f3530d40ee41;p=git.git [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 --- diff --git a/git-merge-recursive.py b/git-merge-recursive.py index 145a5cf0d..eeb3d24da 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)