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

output=`git grep -En '^<<<<<<< '`
echo $output
test -z "$output"