KDiff3: “There is a line end style conflict”

Here’s a screenshot to walk you through the process that Matt Wilkie described in his answer.

1. Click in the C pane.
2. Choose an encoding other than ‘conflict’
3. Save