-1

I am using kdiff3 as the default merge tool for git mergetool.

I have a conflict, I launch git mergetool. Kdiff3 is correctly launched with the correct files. I solve all the conflicts in the file. Now the bottom output pane show what I want the file to be. I save.

While I still am in kdiff3, I can see in vim the file is full of diff marking. After saving in Kdiff3, I can reload the file in vim and see it's what I want.

Here is the problem, when I close kdiff3, git says the merge failed and if I reload the file in vim, the conflict markings are back.

What is happening ? What am I doing wrong ?

Syl
  • 3,545
  • 6
  • 33
  • 58
  • No, the command git mergetool works, and kdiff3 load the correct files, it's the final part that do not work, exiting kdiff3 and keep the changes made. – Syl May 17 '22 at 12:30
  • 1
    So you have your trustExitCode configured correctly? Prove it, please. – matt May 17 '22 at 12:43
  • I thought this answer was for windows, it seems my problem was the trustExitCode, thx – Syl May 17 '22 at 12:54
  • 1
    There are multiple answers there; many are not for Windows. It does help to actually _read_ the answers and maybe even _try_ them before deciding to reject a link. – matt May 17 '22 at 13:00
  • I read it and the question was about installing kdiff3 on windows. – Syl May 17 '22 at 13:07

0 Answers0