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

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