Mercurial > hg-stable
graph
-
merge-tools: add a `premerge=keep-merge3` config optionMon, 04 Aug 2014 16:32:41 -0700, by Pierre-Yves David
-
merge-tools: make premerge valid values extensibleMon, 04 Aug 2014 16:58:39 -0700, by Pierre-Yves David
-
mergetools: add a test for premerge --keepMon, 04 Aug 2014 16:50:15 -0700, by Pierre-Yves David
-
test-merge-tools: introduce a "revision 4" that merges with conflictMon, 04 Aug 2014 16:39:47 -0700, by Pierre-Yves David