Compare Text FilesEllié Computing Merge let you compare text files side by side, differences are displayed using background colours.
You can load a side directly from the clipboard by Copy/paste.
ECMerge computes differences inside the lines and let you navigate and reconcile these differences easily from the contextual menu.
You can fully edit the result of the merge in the bottom result panel.
ECMerge documentation: Text Comparison and Merging