Files
client-tools-1.2/tools/resolve_live_check.pl
2015-08-04 12:05:18 -05:00

11 lines
210 B
Perl

while (<>)
{
chomp;
s/Accept\(a\) Edit\(e\) Diff\(d\) Merge \(m\) Skip\(s\) Help\(\?\) at: //;
if (/[1-9][0-9]* yours/ || /[1-9][0-9]* conflicting/)
{
print $last, "\n", $_, "\n", "\n";
}
$last = $_;
}