Git mergetool with Meld on Windows

Question

In Linux, my favorite merge tool is Meld, and I\'ve had no problems using or configuring it to work with Git. However, in Windows it has been a different story.

Fir

Answer 1

None of the answers worked for me. I ended up with this in the .gitconfig-file:

[merge]
  tool = meld
[mergetool "meld"]
  cmd = 'C:/Program Files (x86)/Meld/Meld.exe' $LOCAL $BASE $REMOTE --output=$MERGED
[mergetool]
  prompt = false

After a git merge mybranch ending with conflicts, you simply type git mergetool and meld opens. After a save, you have to commit in git and the conflicts are resolved.

For some reason, this only worked with Meld 3.18.x, Meld 3.20.x gives me an error.