git-merge - 如何将 Meld 设置为 git mergetool

Question

我已经设置:

git config --global merge.tool meld
git config --global mergetool.meld.path c:/Progra~2/meld/bin/

在“git mergetool”上写道:

Hit return to start merge resolution tool (meld):
The merge tool meld is not available as 'c:/Progra~2/meld/bin/'

我也尝试过:

• /c/Progra~2/meld/bin/
• “/c/程序文件 (x86)/meld/bin/”
• “c:/程序文件 (x86)/meld/bin/”

结果是一样的。

当我转到 C:/Program files (x86)/meld/bin/并运行时

python meld

该工具运行。

Answer 1

您可以使用完整的 UNIX 路径，例如:

PATH=$PATH:/c/python26
git config --global merge.tool meld
git config --global mergetool.meld.path /c/Program files (x86)/meld/bin/meld

这就是“How to get meld working with git on Windows”中描述的内容

或者您可以采用“Use Meld with Git on Windows”中描述的包装器方法

# set up Meld as the default gui diff tool
$ git config --global  diff.guitool meld

# set the path to Meld
$ git config --global mergetool.meld.path C:/meld-1.6.0/Bin/meld.sh

使用脚本meld.sh:

#!/bin/env bash
C:/Python27/pythonw.exe C:/meld-1.6.0/bin/meld $@

<小时/>

abergmeier提到in the comments :

I had to do:

git config --global merge.tool meld
git config --global mergetool.meld.path /c/Program files (x86)/Meld/meld/meldc.exe

Note that meldc.exe was especially created to be invoked on Windows via console. Thus meld.exe will not work properly.

<小时/>

CenterOrbit the comments 中提到Mac OS 安装homebrew ，然后:

brew cask install meld
git config --global merge.tool meld
git config --global  diff.guitool meld