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