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

5 lines
76 B
Bash
Executable file

#!/bin/sh
output=`git grep -En '^<<<<<<< '`
echo $output
test -z "$output"