Mercurial > dotfiles.old

comparison 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
comparison
equal deleted inserted replaced
30:7dfc911400a3 31:faf7781dae42
10 10
11 for $file (@files) { 11 for $file (@files) {
12 open FILE, "$file" or die $!; 12 open FILE, "$file" or die $!;
13 my @lines = <FILE>; 13 my @lines = <FILE>;
14 for $i (keys @lines) { 14 for $i (keys @lines) {
15 if ($lines[$i] =~ /\<{2,}/) { 15 if ($lines[$i] =~ /\<{3,}/) {
16 $linenr = $i + 1; 16 $linenr = $i + 1;
17 print color("blue"), "$file", color("reset"); 17 print color("blue"), "$file", color("reset");
18 print ":"; 18 print ":";
19 print color("yellow"), "$linenr ", color("reset"); 19 print color("yellow"), "$linenr ", color("reset");
20 print "$lines[$i]"; 20 print "$lines[$i]";