>> Meld is set up as in mercurial's contrib/mergetools.hgrc. I'm not >> sure that's the right thing to be doing. From what I can tell, meld's >> 3-way merge is not really 3-way, but 3 file (it doesn't do anything >> special with the ancestor, it just sticks it in a 3rd diff pane), I've >> found that nothing but annoying. > > The third file is the output file, right? The one in the center pane? > It's initialized to be the ancestor, and then you click on the left or > right pane to propagate diffs? The hideous part seemed to be that you > could propagate in both directions, in other words modify the new, old, > and merged files? >
Correct. The ancestor is in the middle, and you can merge to it from either side. I agree, meld isn't the best, but it is a start and it does have an active community which may want to improve it given some requirements. Cheers, Jim
