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

6 lines
76 B
Bash
Executable File

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