summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Kuivinen <freku045@student.liu.se>2005-09-13 21:40:23 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-13 22:45:24 (GMT)
commit0d214b6619bf14a6409a2a1ba079f3530d40ee41 (patch)
treec66cfbe40dba9ed56ea2c87bc0cdd7f079da63f2
parentd9a23fa6f7124befe7803f5f3a8c53999578caa4 (diff)
downloadgit-0d214b6619bf14a6409a2a1ba079f3530d40ee41.zip
git-0d214b6619bf14a6409a2a1ba079f3530d40ee41.tar.gz
git-0d214b6619bf14a6409a2a1ba079f3530d40ee41.tar.bz2
[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>
-rwxr-xr-xgit-merge-recursive.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 145a5cf..eeb3d24 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)