Merge branch 'js/etc-config'

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);