undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Fredrik Kuivinen 2005-09-13 23:40:23 +02:00 committed by Junio C Hamano
parent d9a23fa6f7
commit 0d214b6619
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
git-merge-recursive.py
View File

@ -423,5 +423,4 @@ except:
if clean: if clean:
sys.exit(0) sys.exit(0)
else: else:
print 'Automatic merge failed, fix up by hand'
sys.exit(1) sys.exit(1)