Mercurial > hg
graph
-
filemerge: in ':prompt', use ':fail' tool rather than returning directlyTue, 24 Nov 2015 10:58:35 -0800, by Siddharth Agarwal
-
filemerge: in ':fail' tool, write out other side if local side is deletedTue, 24 Nov 2015 10:57:01 -0800, by Siddharth Agarwal
-
mergestate: explicitly forget 'dc' conflicts where the deleted side is pickedMon, 23 Nov 2015 18:03:25 -0800, by Siddharth Agarwal