From: Fredrik Kuivinen Date: Tue, 13 Sep 2005 21:40:23 GMT Subject: [PATCH 2/5] Don't output 'Automatic merge failed, ...' Message-ID: <20050913214023.GC10953@c165.ib.student.liu.se> In-Reply-To: <20050913213730.GA10953@c165.ib.student.liu.se> git-merge.sh does this for us. Signed-off-by: Fredrik Kuivinen --- git-merge-recursive.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) e0e1a108a224b6bf202beb59c1514325205d3638 diff --git a/git-merge-recursive.py b/git-merge-recursive.py --- 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)