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

output=`git grep -En '^<<<<<<< ' -- . ':(exclude)spec/lib/gitlab/conflict/file_spec.rb' ':(exclude)spec/lib/gitlab/git/conflict/parser_spec.rb'`
echo $output
test -z "$output"