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: 2d04507f81eee48af31bb0ea5adb0a98f91e75a4 (plain)

#!/bin/sh

output=`git grep -En '^<<<<<<< ' -- . ':(exclude)spec/lib/gitlab/conflict/file_spec.rb' ':(exclude)spec/lib/gitlab/git/conflict/parser_spec.rb'`
echo $output
test -z "$output"