Mercurial > hg
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
-
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
-
merge: use no-minimal for premerge tooTue, 29 Jul 2014 11:55:01 -0700, by Pierre-Yves David
-
merge: refactor labels selection codeMon, 09 Jun 2014 23:37:36 -0700, by Pierre-Yves David
-
push: include phase push in the unified bundle2 pushTue, 01 Jul 2014 23:08:17 +0200, by Pierre-Yves David
-
push: perform phases discovery before the pushWed, 30 Jul 2014 19:26:47 -0700, by Pierre-Yves David
-
push: make discovery extensibleTue, 01 Jul 2014 17:06:02 +0200, by Pierre-Yves David
-
push: rework the bundle2partsgenerators logicWed, 30 Jul 2014 19:04:50 -0700, by Pierre-Yves David