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

#!/bin/sh

output=`git grep -En '^<<<<<<< '`
echo $output
test -z "$output"
New upstream version 9.5.4+dfsg 2017-09-10 17:25:29 +05:30			`#!/bin/sh`

New upstream version 12.8.6 2020-03-13 15:44:24 +05:30			output=`git grep -En '^<<<<<<< '`
New upstream version 9.5.4+dfsg 2017-09-10 17:25:29 +05:30			`echo $output`
			`test -z "$output"`