kdiff3

Ok, I figured it out. To add manual diff alignment in KDiff3: Put the cursor at the beginning of some text in one child window Hit Ctrl+Y Put the cursor at the beginning of some text in another child window Hit Ctrl+Y

Here’s a screenshot to walk you through the process that Matt Wilkie described in his answer. Click in the C pane. Choose an encoding other than ‘conflict’ Save