VladPolskiy/gitlabhq
1
0
Fork 0
mirror of https://github.com/gitlabhq/gitlabhq.git synced 2025-07-25 17:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure we didn't commit conflicts

Browse Source
This commit is contained in:
Lin Jen-Shin (godfat)
2017-08-01 12:06:56 +00:00
committed by Rémy Coutable
parent 0bbf006454
commit 913aca1db9
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/lint-conflicts.sh Executable file
View File

@ -0,0 +1,5 @@
#!/bin/sh
output=`git ls-files -z | grep -zvE '\.(rb|js|haml)$' | xargs -0n1 grep -HEn '^<<<<<<< '`
echo $output
test -z "$output"