History senstive merging?

Giorgos Keramidas keramida at ceid.upatras.gr
Thu Dec 11 18:37:01 UTC 2008


On Thu, 11 Dec 2008 13:33:21 -0500, Neal Becker <ndbecker2 at gmail.com> wrote:
> What do you recommend for history sensitive merging?
>
> I have a file A, which I copied and modified into B.  Now I want to
> take the updates to A and apply them to B.  What 3-way diff tool is
> good for this?

If you used "hg copy A B" to perform the copy this will happen
automatically with _any_ merge tool.



More information about the Mercurial mailing list