view bin/git-conflict @ 250:7a595f9ef896

Switch to tmux-continuum
author zegervdv <zegervdv@me.com>
date Mon, 23 Feb 2015 17:53:58 +0100
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;
}