Maybe its a fear of heights or itchy toes or perhaps, "step on a crack and break your mother's back" paranoia, but I NEVER EVER would trust software to merge code, text or even meatloaf. I would and have used comparison and versioning tools, but if I ever had to shovel the old back into the new or vice a versa, I would always do it methodically line for line, word for word, character for character by hand.
And they say they are crazy, I allow you to view me as loony as a toon, but I still hold on to my right using the 133rd constitutional amendment of the right to merge !
But not unlike using the barrel of an Uzi Machine gun to stir your coffee, if this merge tool does everything that Windiff does and makes toast then count me in. 😎