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 /templates | |
| 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 'templates')
| -rw-r--r-- | templates/hooks--pre-commit | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit index 43d3b6ef4a..723a9ef210 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); |