log

age author description
Mon, 04 Aug 2014 16:50:15 -0700 Pierre-Yves David mergetools: add a test for premerge --keep
Mon, 04 Aug 2014 16:39:47 -0700 Pierre-Yves David test-merge-tools: introduce a "revision 4" that merges with conflict
Tue, 05 Aug 2014 14:58:45 -0700 Pierre-Yves David merge: add an internal:merge3 tool
Tue, 05 Aug 2014 15:09:54 -0700 Pierre-Yves David internal:merge: update documentation
Tue, 05 Aug 2014 15:17:38 -0700 Pierre-Yves David filemerge: allow the formatting of three labels instead of two
Tue, 05 Aug 2014 15:12:22 -0700 Pierre-Yves David filemerge: drop extra white space
Tue, 05 Aug 2014 15:10:50 -0700 Pierre-Yves David simplemerge: support three labels when merging
Tue, 05 Aug 2014 14:56:25 -0700 Pierre-Yves David simplemerge: burn "minimal" feature to the ground
Tue, 29 Jul 2014 11:55:01 -0700 Pierre-Yves David merge: use no-minimal for premerge too
Mon, 09 Jun 2014 23:37:36 -0700 Pierre-Yves David merge: refactor labels selection code
Tue, 01 Jul 2014 23:08:17 +0200 Pierre-Yves David push: include phase push in the unified bundle2 push
Wed, 30 Jul 2014 19:26:47 -0700 Pierre-Yves David push: perform phases discovery before the push
Tue, 01 Jul 2014 17:06:02 +0200 Pierre-Yves David push: make discovery extensible
Wed, 30 Jul 2014 19:04:50 -0700 Pierre-Yves David push: rework the bundle2partsgenerators logic
Tue, 01 Jul 2014 17:27:22 +0200 Pierre-Yves David push: move common heads computation into pushop