Fri, 13 Nov 2015 23:57:43 -0800 Siddharth Agarwal filemerge: don't try using external tools on change/delete conflicts
Fri, 13 Nov 2015 23:56:00 -0800 Siddharth Agarwal filemerge: don't attempt to premerge change/delete conflicts
Fri, 13 Nov 2015 23:58:05 -0800 Siddharth Agarwal filemerge._mergecheck: add check for change/delete conflicts
(0) -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 tip