Mercurial > dotfiles.old

comparison bin/git-conflict @ 6:d35280c9b023

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add custom CLI tools
author zegervdv <zegervdv@me.com>
date Sun, 23 Feb 2014 18:52:12 +0100
parents
children faf7781dae42
comparison
equal deleted inserted replaced
5:8975f7375c41 6:d35280c9b023
1 #!/usr/bin/env perl
2 # Find conflict markers in files
3 # 2013, Zeger Van de Vannet
4
5 use Term::ANSIColor;
6
7 my $files = `git ls-files`;
8
9 my @files = split "\n", $files;
10
11 for $file (@files) {
12 open FILE, "$file" or die $!;
13 my @lines = <FILE>;
14 for $i (keys @lines) {
15 if ($lines[$i] =~ /\<{2,}/) {
16 $linenr = $i + 1;
17 print color("blue"), "$file", color("reset");
18 print ":";
19 print color("yellow"), "$linenr ", color("reset");
20 print "$lines[$i]";
21 }
22 }
23 close FILE;
24 }