Merge branch 'master' of https://Governor-Tarkin@bitbucket.org/Governor-Tarkin/swg...
[swg-src.git] / tools / resolve_live_check.pl
blob7a8fa60d3ca24876d6a9527fc7c05d23fc46faee
1 while (<>)
3 chomp;
4 s/Accept\(a\) Edit\(e\) Diff\(d\) Merge \(m\) Skip\(s\) Help\(\?\) at: //;
5 if (/[1-9][0-9]* yours/ || /[1-9][0-9]* conflicting/)
7 print $last, "\n", $_, "\n", "\n";
9 $last = $_;