Thanks for pointing me to meld, but have you used it? I don't grok it. The "base" version is in the middle, the "other" version is on the right. When I want to pick something from "other", I have to push it into the middle and then into the left? And all of a sudden it refreshes and looses its mind of what has changed, it's all colorful?
And there is not automatic resolution of nonconflicting lines, I have to manually resolve every single change? I must be stupid. Or the tool is crap for merging. Similar findings (perhaps more polite) at http://www.selenic.com/mercurial/wiki/Meld I enjoy it for diffing, but merging... -- This message posted from opensolaris.org _______________________________________________ opensolaris-discuss mailing list opensolaris-discuss@opensolaris.org
