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 | |
| parent | ba580aeafb52921025de1efe1c50db34393f9907 (diff) | |
| parent | 61c2bcbd11e3b66a328b3850c01592e5dc1c67bb (diff) | |
| download | git-b8950769b8b91d634ec549fd1af792ccc1864f79.tar.gz git-b8950769b8b91d634ec549fd1af792ccc1864f79.tar.xz | |
Merge branch 'maint'
* maint:
pre-commit hook: complain about conflict markers.
git-merge: a bit more readable user guidance.
| -rwxr-xr-x | git-merge.sh | 2 | ||||
| -rw-r--r-- | templates/hooks--pre-commit | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index 78ab422e4..b834e79c9 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 diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit index 43d3b6ef4..723a9ef21 100644 --- a/templates/hooks--pre-commit +++ b/templates/hooks--pre-commit @@ -61,6 +61,9 @@ perl -e ' if (/^\s* /) { bad_line("indent SP followed by a TAB", $_); } + if (/^(?:[<>=]){7}/) { + bad_line("unresolved merge conflict", $_); + } } } exit($found_bad); |