diff options
| -rwxr-xr-x | scripts/lint-conflicts.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lint-conflicts.sh b/scripts/lint-conflicts.sh index f3877600c8c..630fb94d2d2 100755 --- a/scripts/lint-conflicts.sh +++ b/scripts/lint-conflicts.sh @@ -1,5 +1,5 @@ #!/bin/sh -output=`git ls-files -z | grep -zvE '\.(rb|js|haml)$' | xargs -0n1 grep -HEn '^<<<<<<< '` -echo $output +output=$(git grep -E '^<<<<<<< HEAD' -- '*.haml' '*.js' '*.rb') +echo "$output" test -z "$output" |