diff options
Diffstat (limited to 'scripts/lint-conflicts.sh')
| -rwxr-xr-x | scripts/lint-conflicts.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/lint-conflicts.sh b/scripts/lint-conflicts.sh new file mode 100755 index 00000000000..f3877600c8c --- /dev/null +++ b/scripts/lint-conflicts.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +output=`git ls-files -z | grep -zvE '\.(rb|js|haml)$' | xargs -0n1 grep -HEn '^<<<<<<< '` +echo $output +test -z "$output" |