I'm not sure gentlemen. I think we have a UNIX spy using a code word in place of the "vi" editor. Come on we know you just love...

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...

I respond to the gentleman that favored WinDiff as the ubiquitous do it right, and do it every time thing. I agree with him save one bothersome...