Mercurial > hg-stable
graph
-
test-merge-tools: introduce a "revision 4" that merges with conflictMon, 04 Aug 2014 16:39:47 -0700, by Pierre-Yves David
-
merge: add an internal:merge3 toolTue, 05 Aug 2014 14:58:45 -0700, by Pierre-Yves David
-
internal:merge: update documentationTue, 05 Aug 2014 15:09:54 -0700, by Pierre-Yves David
-
filemerge: allow the formatting of three labels instead of twoTue, 05 Aug 2014 15:17:38 -0700, by Pierre-Yves David
-
filemerge: drop extra white spaceTue, 05 Aug 2014 15:12:22 -0700, by Pierre-Yves David
-
simplemerge: support three labels when mergingTue, 05 Aug 2014 15:10:50 -0700, by Pierre-Yves David
-
simplemerge: burn "minimal" feature to the groundTue, 05 Aug 2014 14:56:25 -0700, by Pierre-Yves David