diff options
Diffstat (limited to 'git-merge-recursive.py')
| -rwxr-xr-x | git-merge-recursive.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/git-merge-recursive.py b/git-merge-recursive.py index 145a5cf0d..eeb3d24da 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) |