Make builtin-mv.c use parse-options

diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit
index 43d3b6ef4a0e515cdc8d9874a81029d4d9425f64..a19279b3e41653b519b8c3b266bc7845f3648c4b 100644 (file)
--- a/templates/hooks--pre-commit
+++ b/templates/hooks--pre-commit
@@ -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 (/^(?:[<>=]){7}/) {
+               bad_line("unresolved merge conflict", $_);
+           }
        }
     }
     exit($found_bad);
 '
-