Kaff3: “有一个行结束样式冲突”

我尝试使用 KDiff3来解决窗口上的冲突。但是当运行合并时，我得到:

Kaff3: “有一个行结束样式冲突”

没有任何东西被合并/解决:

first screenshot

即使我选择 DOS 行结束前运行合并:

second screenshot

有什么想法吗？

如果我只是保存而不是按下合并按钮，它似乎可以工作。这可能是一个解决方案。

27687 次浏览
小开

What worked for me:

  • make the output pane active (click in it),
  • manually choose both Encoding and Line end style drop down choices,
  • save (Ctrl + S).

Without doing all three steps, I just kept getting the same error popup. Choosing Use A everwhere and/or related merge menu items had no effect.

小开
最佳答案

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


提交答案