Merge branch 'maint'

* maint:
pre-commit hook: complain about conflict markers.
git-merge: a bit more readable user guidance.

diff --git a/git-merge.sh b/git-merge.sh
index 78ab422e4ef294d8bcffba91bb7e2116e381d98e..b834e79c98af51a9f3ad4927a2d11c999349b0e4 100755 (executable)
--- 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 43d3b6ef4a0e515cdc8d9874a81029d4d9425f64..723a9ef210bb84c217026c2cdf9d30661f64447b 100644 (file)
--- 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);