Differences between revisions 1 and 2
Revision 1 as of 2008-02-12 16:09:36
Size: 796
Editor: abuehl
Comment: new page
Revision 2 as of 2008-03-25 13:26:39
Size: 656
Editor: abuehl
Comment: available in 1.0
Deletions are marked like this. Additions are marked like this.
Line 6: Line 6:
Note that — as of February 12, 2008 — this is an upcoming feature, not yet contained in the current 0.9.5 release of Mercurial. This feature is expected for release 1.0. This feature is available in version 1.0.

In February 2008, [:mpm:Matt Mackall] contributed a new [:Merge:merge] tool configuration feature into the Mercurial main source code repository.

This feature is available in version 1.0.

See also: [:WhatsNew], [:MergeProgram], [:.hgrc]

MergeToolConfiguration (last edited 2019-08-07 17:58:24 by GregTatum)