Git mergetool with Meld on Windows

前端 未结 9 1159
名媛妹妹
名媛妹妹 2020-12-02 05:19

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

9条回答
  •  余生分开走
    2020-12-02 06:19

    I found a solution in a bug report on the meld installer, on this page:

    https://code.google.com/p/meld-installer/issues/detail?id=11

    As far as I understand, the problem is that the meld.exe program (which runs meld through the python interpreter) needlessly sets the command's working directory to that of meld.exe. This causes relative paths to be interpreted incorrectly when passed as command line arguments.

    The solution is to replace the provided meld.exe with one generated by compiling the meld.ahk file, using AHK2EXe (AutoHotKey script -> exe). Just download the script furthest down the page, as there have been a few version posted there.

提交回复
热议问题