summaryrefslogtreecommitdiff
path: root/scripts/lint-conflicts.sh
blob: f3877600c8c9bb92be4807dd18103ae26983116f (plain)
1
2
3
4
5
#!/bin/sh

output=`git ls-files -z | grep -zvE '\.(rb|js|haml)$' | xargs -0n1 grep -HEn '^<<<<<<< '`
echo $output
test -z "$output"