From 913aca1db9b1bbf90f3490262c4429d95fbc517c Mon Sep 17 00:00:00 2001
From: "Lin Jen-Shin (godfat)" <godfat@godfat.org>
Date: Tue, 1 Aug 2017 12:06:56 +0000
Subject: Make sure we didn't commit conflicts

---
 scripts/lint-conflicts.sh | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100755 scripts/lint-conflicts.sh

(limited to 'scripts/lint-conflicts.sh')

diff --git a/scripts/lint-conflicts.sh b/scripts/lint-conflicts.sh
new file mode 100755
index 00000000000..f3877600c8c
--- /dev/null
+++ b/scripts/lint-conflicts.sh
@@ -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"
-- 
cgit v1.2.3