Mercurial > dotfiles.old

diff bin/git-conflict @ 31:faf7781dae42

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Only show conflict markers when more than 3 <
author zegervdv <zegervdv@me.com>
date Tue, 01 Apr 2014 20:56:02 +0200
parents d35280c9b023
children
line wrap: on
line diff
--- 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 ":";