diff --git a/hack/validate-git-marks.sh b/hack/validate-git-marks.sh index 0ba98f45..57943942 100755 --- a/hack/validate-git-marks.sh +++ b/hack/validate-git-marks.sh @@ -6,17 +6,7 @@ unset IFS badFiles=() for f in "${files[@]}"; do - if [ $(grep -r "^<<<<<<<" $f) ]; then - badFiles+=( "$f" ) - continue - fi - - if [ $(grep -r "^>>>>>>>" $f) ]; then - badFiles+=( "$f" ) - continue - fi - - if [ $(grep -r "^=======$" $f) ]; then + if [ $(grep -r "^\(<<<<<<<\|>>>>>>>\|^=======$\)" $f) ]; then badFiles+=( "$f" ) continue fi