# HG changeset patch
# User zegervdv <zegervdv@me.com>
# Date 1396378562 -7200
# Node ID faf7781dae423719e84403be812cf480d15ad8cb
# Parent  7dfc911400a36f8a08551ed7334919e784058620
Only show conflict markers when more than 3 <

diff -r 7dfc911400a3 -r faf7781dae42 bin/git-conflict
--- a/bin/git-conflict	Tue Apr 01 20:50:06 2014 +0200
+++ b/bin/git-conflict	Tue Apr 01 20:56:02 2014 +0200
@@ -12,7 +12,7 @@
   open FILE, "$file" or die $!;
   my @lines = <FILE>;
   for $i (keys @lines) {
-    if ($lines[$i] =~ /\<{2,}/) {
+    if ($lines[$i] =~ /\<{3,}/) {
       $linenr = $i + 1;
       print color("blue"), "$file", color("reset");
       print ":";