[PATCH] merge: supply base node to merge tools in the environment

Sune Foldager cryo at cyanite.org
Thu Nov 5 08:28:50 CST 2009


Sune Foldager wrote:
> # HG changeset patch
> # User Sune Foldager <cryo at cyanite.org>
> # Date 1257344299 -3600
> # Node ID 5858117a007732940a71ac2b2e035d086d8320c3
> # Parent  a9424b6a1a6da70f28b1a61221d8fdc9e044f6c8
> merge: supply base node to merge tools in the environment
> 
> Merge tools will be able to exploit this to correctly merge backouts.
> This won't work fully, though, until issue 1327 is solved, since the
> node information is not necessarily correct.

I pushed this as 5858117a0077

/Sune

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 552 bytes
Desc: OpenPGP digital signature
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20091105/63c09bb5/attachment.pgp 


More information about the Mercurial-devel mailing list