Mercurial > hg-stable
graph
-
mergestate: explicitly forget 'dc' conflicts where the deleted side is pickedMon, 23 Nov 2015 18:03:25 -0800, by Siddharth Agarwal
-
merge.applyupdates: add all actions returned from merge stateMon, 23 Nov 2015 19:06:15 -0800, by Siddharth Agarwal