Revision 1 as of 2008-02-12 16:09:36
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.
"[http://selenic.com/pipermail/mercurial/2008-February/016923.html New merge tool system in mainline]", posting by Matt Mackall, Feb 3, 2008, [http://selenic.com/pipermail/mercurial/ Mercurial mailing list]
This feature is available in version 1.0.