unpack-trees.c: assume submodules are clean during check-out

diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit
index 43d3b6ef4a0e515cdc8d9874a81029d4d9425f64..18b87309f65be23794b87260e08c547f5deeefce 100644 (file)
--- a/templates/hooks--pre-commit
+++ b/templates/hooks--pre-commit
@@ -61,8 +61,10 @@ perl -e '
            if (/^\s*   /) {
                bad_line("indent SP followed by a TAB", $_);
            }
+           if (/^(?:[<>=]){7}/) {
+               bad_line("unresolved merge conflict", $_);
+           }
        }
     }
     exit($found_bad);
 '
-