Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
[PATCH] Don't output 'Automatic merge failed, ...'
author
Fredrik Kuivinen
<freku045@student.liu.se>
Tue, 13 Sep 2005 21:40:23 +0000
(23:40 +0200)
committer
Junio C Hamano
<junkio@cox.net>
Tue, 13 Sep 2005 22:45:24 +0000
(15:45 -0700)
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>
git-merge-recursive.py
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
d9a23fa
)
diff --git
a/git-merge-recursive.py
b/git-merge-recursive.py
index 145a5cf0d1fccc8ed6a18be4ae92af5e9cebe779..eeb3d24da8224a2275513918480c0b7866dfbe01 100755
(executable)
--- a/
git-merge-recursive.py
+++ b/
git-merge-recursive.py
@@
-423,5
+423,4
@@
def usage():
if clean:
sys.exit(0)
else:
- print 'Automatic merge failed, fix up by hand'
sys.exit(1)