Mercurial > hg-stable
graph
-
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
-
filemerge: break overall filemerge into separate premerge and merge stepsSun, 11 Oct 2015 20:47:14 -0700, by Siddharth Agarwal