lint-conflicts.sh « scripts - gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.

Welcome to mirror list, hosted at ThFree Co, Russian Federation.

lint-conflicts.sh « scripts - gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.

index : gitlab.com/gitlab-org/gitlab-foss.git

Unnamed repository; edit this file 'description' to name the repository.

root

summary refs log tree commit diff

path: root/scripts/lint-conflicts.sh

blob: f3877600c8c9bb92be4807dd18103ae26983116f (plain)

#!/bin/sh

output=`git ls-files -z | grep -zvE '\.(rb|js|haml)$' | xargs -0n1 grep -HEn '^<<<<<<< '`
echo $output
test -z "$output"