[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>
Fredrik Kuivinen committed
Sep 13, 2005 at 23:40 UTC
0d214b6619bf14a6409a2a1ba079f3530d40ee41
1 file changed
-1
git-merge-recursive.py
-1
@@ -423,5 +423,4 @@ except:
423
if clean:
424
sys.exit(0)
425
else:
426
- print 'Automatic merge failed, fix up by hand'
426
sys.exit(1)