diff options
Diffstat (limited to 'scripts/lint-conflicts.sh')
-rwxr-xr-x | scripts/lint-conflicts.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lint-conflicts.sh b/scripts/lint-conflicts.sh index 239e227a41e..2d240e420d9 100755 --- a/scripts/lint-conflicts.sh +++ b/scripts/lint-conflicts.sh @@ -1,5 +1,5 @@ #!/bin/sh -output=`git grep -En '^<<<<<<< '` +output=$(git grep -En '^<<<<<<< ') echo $output test -z "$output" |