KDiff3: "There is a line end style conflict"

kdiff3
u123 picture u123 · Dec 9, 2014 · Viewed 23.9k times · Source

I am trying to use KDiff3 to solve conflicts on windows. But when run the merge I get:

KDiff3: "There is a line end style conflict"

And nothing is merged/solved:

first screenshot

Even though I selected DOS line ending before running the merge:

second screenshot

Any ideas?

It seems to work if I just save instead of pressing the Merge button. That could be a solution.

Answer

Bill Tarbell picture Bill Tarbell · May 20, 2016

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

enter image description here

Related questions

Git: How configure KDiff3 as merge tool and diff tool

Recently I was using GitExtension 2.46, but the Git version that has the same is 1.9.4.msysgit.2. Willing to use only Git commands, I uninstalled GitExtension and install the latest version available of Git and KDiff3. When I make a merge and …

Read More
How to configure kdiff3 instead of emerge as a git mergetool?

I have Git on mac OSX Snow Leopard and I tried to edit my merge and diff tool to use kdiff3 instead of emerge. But when I try to use it does not launch the GUI of kdiff and keeps …

Read More
What are A, B, and C in KDIFF merge

Why am I given three choices when merging between my code and someone else's? Shouldn't there just be my code, the other person's code, and the output below? The documentation for KDIFF doesn't help me understand.

Read More