Mercurial > dotfiles.old
view bin/git-conflict @ 122:5ec9c636da2a
Revert "Add targets plugin"
This reverts commit 70236b32790d77ecc5318acf9a6c493af98faf62.
author | zegervdv <zegervdv@me.com> |
---|---|
date | Mon, 29 Sep 2014 20:34:31 +0200 |
parents | faf7781dae42 |
children |
line wrap: on
line source
#!/usr/bin/env perl # Find conflict markers in files # 2013, Zeger Van de Vannet use Term::ANSIColor; my $files = `git ls-files`; my @files = split "\n", $files; for $file (@files) { open FILE, "$file" or die $!; my @lines = <FILE>; for $i (keys @lines) { if ($lines[$i] =~ /\<{3,}/) { $linenr = $i + 1; print color("blue"), "$file", color("reset"); print ":"; print color("yellow"), "$linenr ", color("reset"); print "$lines[$i]"; } } close FILE; }