All I have to say for today is, “Thank God for Araxis Merge.”
Really. I bought this tool a while back, and it’s been worth every penny, and more; it’s about as indispensable as the Emacs clone I use (Lugaru’s Epsilon, here).
Tools that “just work” are few and far between. Let’s hear some praise for them.