diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 00:09:04 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 00:09:04 +0000 |
| commit | 27a18afc7dba4e09a5ec78e5c251c31216d7792a (patch) | |
| tree | 5dcc015be79e00de4133a66defe10bf1463ff827 /scripts | |
| parent | 71c9d577ad563572050335dc261ba7673e3e566f (diff) | |
| download | gitlab-ce-27a18afc7dba4e09a5ec78e5c251c31216d7792a.tar.gz | |
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 2d04507f81e..239e227a41e 100755 --- a/scripts/lint-conflicts.sh +++ b/scripts/lint-conflicts.sh @@ -1,5 +1,5 @@ #!/bin/sh -output=`git grep -En '^<<<<<<< ' -- . ':(exclude)spec/lib/gitlab/conflict/file_spec.rb' ':(exclude)spec/lib/gitlab/git/conflict/parser_spec.rb'` +output=`git grep -En '^<<<<<<< '` echo $output test -z "$output" |