DiffMerge. https://www.sourcegear.com/ diffmerge/

Diffmerge