I've set:
git config --global merge.tool meld
git config --global mergetool.meld.path c:/Progra~2/meld/bin/
On "git mergetool" it writes:
Hit return to start merge resolution tool (meld):
The merge tool meld is not available as 'c:/Progra~2/meld/bin/'
I have tried also:
- /c/Progra~2/meld/bin/
- "/c/Program files (x86)/meld/bin/"
- "c:/Program files (x86)/meld/bin/"
result is the same.
when I go to C:/Program files (x86)/meld/bin/ and run
python meld
the tool runs.
None of the other answers here worked for me, possibly from trying a combination of all of them. I was able to adapt this accepted answer to work with meld. This is now working for me with git 1.9.4, meld 3.14.0, and windows 8.1.
Edit ~/.gitconfig to look like:
I think that
mergetool.meld.path
should point directly to the meld executable. Thus, the command you want is:meld 3.14.0
For windows add the path for meld is like below:
You could use complete unix paths like:
This is what is described in "How to get meld working with git on Windows"
Or you can adopt the wrapper approach described in "Use Meld with Git on Windows"
With a script
meld.sh
:abergmeier mentions in the comments:
CenterOrbit mentions in the comments for Mac OS to install homebrew, and then:
This worked for me on Windows 8.1 and Windows 10.