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?