diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-19 15:41:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-19 15:41:55 -0700 |
| commit | b8950769b8b91d634ec549fd1af792ccc1864f79 (patch) | |
| tree | 9c1f18332894c18f404932ad11be32d401fbe5eb /git-merge.sh | |
| parent | diff: move diff.c to diff-lib.c to make room. (diff) | |
| parent | pre-commit hook: complain about conflict markers. (diff) | |
| download | tgif-b8950769b8b91d634ec549fd1af792ccc1864f79.tar.xz | |
Merge branch 'maint'
* maint:
pre-commit hook: complain about conflict markers.
git-merge: a bit more readable user guidance.
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index 78ab422e4e..b834e79c98 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -335,5 +335,5 @@ Conflicts: then git-rerere fi - die "Automatic merge failed; fix up by hand" + die "Automatic merge failed; fix conflicts and then commit the result." fi |