Merge git://repo.or.cz/git-gui

diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit
index 43d3b6ef4a0e515cdc8d9874a81029d4d9425f64..b25dce6bbfa5e52108459b9a89b16def6963aec0 100644 (file)
--- a/templates/hooks--pre-commit
+++ b/templates/hooks--pre-commit
@@ -13,7 +13,7 @@
 
 if git-rev-parse --verify HEAD 2>/dev/null
 then
-       git-diff-index -p -M --cached HEAD
+       git-diff-index -p -M --cached HEAD --
 else
        # NEEDSWORK: we should produce a diff with an empty tree here
        # if we want to do the same verification for the initial import.
@@ -58,11 +58,13 @@ perl -e '
            if (/\s$/) {
                bad_line("trailing whitespace", $_);
            }
-           if (/^\s*   /) {
+           if (/^\s* \t/) {
                bad_line("indent SP followed by a TAB", $_);
            }
+           if (/^([<>])\1{6} |^={7}$/) {
+               bad_line("unresolved merge conflict", $_);
+           }
        }
     }
     exit($found_bad);
 '
-