3 ms·Seconded. Beyond Compare is the best merge and diff tool bar none.by tomlu 14y agoSeconded. Beyond Compare is the best merge and diff tool bar none.