Mercurial > hg
graph
-
merge.mergestate: perform all premerges before any merges (BC)Sun, 11 Oct 2015 21:56:39 -0700, by Siddharth Agarwal
-
merge: introduce a preresolve functionSun, 11 Oct 2015 20:12:12 -0700, by Siddharth Agarwal
-
merge.mergestate._resolve: also return completed statusSun, 11 Oct 2015 18:37:54 -0700, by Siddharth Agarwal
-
merge.mergestate: add a wrapper around resolveSun, 11 Oct 2015 18:29:50 -0700, by Siddharth Agarwal
-
simplemerge: move conflict warning message to filemergeFri, 09 Oct 2015 13:54:52 -0700, by Siddharth Agarwal
-
filemerge: clean up some dead codeSun, 11 Oct 2015 15:04:00 -0700, by Siddharth Agarwal
-
run-tests: add b-prefix on two strings to fix python3 supportMon, 12 Oct 2015 14:15:04 -0400, by Augie Fackler