debian-mirror-gitlab/scripts/lint-conflicts.sh

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

6 lines
77 B
Bash
Raw Normal View History

2017-09-10 17:25:29 +05:30
#!/bin/sh
2020-06-23 00:09:42 +05:30
output=$(git grep -En '^<<<<<<< ')
2017-09-10 17:25:29 +05:30
echo $output
test -z "$output"