Fri, 13 Nov 2015 23:58:05 -0800 Siddharth Agarwal filemerge._mergecheck: add check for change/delete conflicts
Sun, 15 Nov 2015 21:40:15 -0800 Siddharth Agarwal filemerge._picktool: only pick from nomerge tools for change/delete conflicts
Fri, 13 Nov 2015 23:52:26 -0800 Siddharth Agarwal filemerge: add support for change/delete conflicts to the ':prompt' tool
Wed, 18 Nov 2015 15:41:50 -0800 Siddharth Agarwal filemerge: add support for change/delete conflicts to the ':other' merge tool
Wed, 18 Nov 2015 15:40:28 -0800 Siddharth Agarwal filemerge: add support for change/delete conflicts to the ':local' merge tool
Thu, 19 Nov 2015 10:50:02 -0800 Siddharth Agarwal merge.mergestate: compute dirstate action
Wed, 18 Nov 2015 14:22:52 -0800 Siddharth Agarwal filemerge: return whether the file was deleted
(0) -10000 -3000 -1000 -300 -100 -30 -10 -7 +7 +10 +30 +100 +300 +1000 +3000 +10000 tip