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 08:06:56 -04:00			`#!/bin/sh`

Add latest changes from gitlab-org/gitlab@master 2020-02-03 19:09:04 -05:00			output=`git grep -En '^<<<<<<< '`
Make sure we didn't commit conflicts 2017-08-01 08:06:56 -04:00			`echo $output`
			`test -z "$output"`