Mercurial > hg
graph
-
copies: when both sides made the same copy, report it as a copyTue, 25 Feb 2014 20:29:14 +0100, by Mads Kiilerich
-
merge: handle create+delete prompts in calculateupdatesSun, 02 Mar 2014 18:36:02 +0100, by Mads Kiilerich
-
merge: handle acceptremove of create+delete early in manifest mergeFri, 28 Feb 2014 02:26:03 +0100, by Mads Kiilerich
-
largefiles: override calculateupdates instead of manifestmergeSun, 02 Mar 2014 18:30:41 +0100, by Mads Kiilerich
-
tests: add systematic test of merge ancestor calculationTue, 25 Feb 2014 20:28:40 +0100, by Mads Kiilerich
-
tests: add test case for criss cross mergeSun, 02 Mar 2014 18:25:19 +0100, by Mads Kiilerich
-
merge with stableMon, 03 Mar 2014 15:34:09 -0600, by Matt Mackall