Mon, 04 Aug 2014 16:32:41 -0700 | Pierre-Yves David | merge-tools: add a `premerge=keep-merge3` config option | changeset | files |
Mon, 04 Aug 2014 16:58:39 -0700 | Pierre-Yves David | merge-tools: make premerge valid values extensible | changeset | files |
Mon, 04 Aug 2014 16:50:15 -0700 | Pierre-Yves David | mergetools: add a test for premerge --keep | changeset | files |
Mon, 04 Aug 2014 16:39:47 -0700 | Pierre-Yves David | test-merge-tools: introduce a "revision 4" that merges with conflict | changeset | files |
Tue, 05 Aug 2014 14:58:45 -0700 | Pierre-Yves David | merge: add an internal:merge3 tool | changeset | files |
Tue, 05 Aug 2014 15:09:54 -0700 | Pierre-Yves David | internal:merge: update documentation | changeset | files |