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

6 lines
132 B
Bash
Raw Normal View History

2017-08-01 08:06:56 -04:00
#!/bin/sh
output=`git ls-files -z | grep -zvE '\.(rb|js|haml)$' | xargs -0n1 grep -HEn '^<<<<<<< '`
echo $output
test -z "$output"