gitlab-org--gitlab-foss/scripts/lint-conflicts.sh

#!/bin/sh

output=$(git grep -En '^<<<<<<< ')
echo $output
test -z "$output"
Make sure we didn't commit conflicts 2017-08-01 12:06:56 +00:00			`#!/bin/sh`

Add latest changes from gitlab-org/gitlab@master 2020-05-22 18:08:21 +00:00			`output=$(git grep -En '^<<<<<<< ')`
Make sure we didn't commit conflicts 2017-08-01 12:06:56 +00:00			`echo $output`
			`test -z "$output"`