diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-22 21:08:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-22 21:08:21 +0300 |
| commit | 1cf95147eabbb193c1db2526e6c8888e950a3987 (patch) | |
| tree | 88ae9b19860f7d0552efd048f47d494adcaa03af /scripts | |
| parent | d6e421b21ed5574700c165cd3361094f4093ac72 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -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" |