正如在这里(以及这里和这里)已经回答的，mergetool是用于配置此操作的命令。对于一个好的图形前端，我推荐kdiff3 (GPL)。

为了跟进Charles Bailey的回答，这里是我使用p4merge(免费跨平台3way合并工具)的git设置;安装msys Git (Windows):

git config --global merge.tool p4merge
git config --global mergetool.p4merge.cmd 'p4merge.exe \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"'

或者，在Windows cmd.exe shell中，第二行变成:

git config --global mergetool.p4merge.cmd "p4merge.exe \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""

变化(相对于查尔斯·贝利):

added to global git config, i.e. valid for all git projects not just the current one the custom tool config value resides in "mergetool.[tool].cmd", not "merge.[tool].cmd" (silly me, spent an hour troubleshooting why git kept complaining about non-existing tool) added double quotes for all file names so that files with spaces can still be found by the merge tool (I tested this in msys Git from Powershell) note that by default Perforce will add its installation dir to PATH, thus no need to specify full path to p4merge in the command

下载:http://www.perforce.com/product/components/perforce-visual-merge-and-diff-tools。

编辑(2014年2月)

正如@Gregory Pakosz所指出的，最新的msysgit现在“本地”支持p4merge(在1.8.5.5.2 .msysgit.0上测试)。

您可以通过运行以下命令显示支持的工具列表:

git mergetool --tool-help

您应该在可用或有效列表中看到p4merge。如果没有，请更新git。

如果p4merge被列出为可用，它在你的PATH中，你只需要设置merge.tool:

git config --global merge.tool p4merge

如果它被列为有效的，则必须定义mergetool.p4merge。除了merge.tool之外的路径:

git config --global mergetool.p4merge.path c:/Users/my-login/AppData/Local/Perforce/p4merge.exe

The above is an example path when p4merge was installed for the current user, not system-wide (does not need admin rights or UAC elevation) Although ~ should expand to current user's home directory (so in theory the path should be ~/AppData/Local/Perforce/p4merge.exe), this did not work for me Even better would have been to take advantage of an environment variable (e.g. $LOCALAPPDATA/Perforce/p4merge.exe), git does not seem to be expanding environment variables for paths (if you know how to get this working, please let me know or update this answer)

我找到了两种方法来配置“SourceGear DiffMerge”作为difftool和github Windows中的mergetool。

命令提示符窗口中的以下命令将更新你的.gitconfig以配置GIT使用DiffMerge:

git config --global diff.tool diffmerge
git config --global difftool.diffmerge.cmd 'C:/Program\ Files/SourceGear/Common/DiffMerge/sgdm.exe  \"$LOCAL\" \"$REMOTE\"'

git config --global merge.tool diffmerge
git config --global mergetool.diffmerge.cmd  'C:/Program\ Files/SourceGear/Common/DiffMerge/sgdm.exe  -merge  -result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"'

[OR]

将以下行添加到.gitconfig中。这个文件应该在你的主目录C:\Users\UserName:

[diff]
    tool = diffmerge
[difftool "diffmerge"]
    cmd = C:/Program\\ Files/SourceGear/Common/DiffMerge/sgdm.exe \"$LOCAL\" \"$REMOTE\"

[merge]
    tool = diffmerge
[mergetool "diffmerge"]
    trustExitCode = true
    cmd = C:/Program\\ Files/SourceGear/Common/DiffMerge/sgdm.exe -merge -result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"

正如在这里(以及这里和这里)已经回答的，mergetool是用于配置此操作的命令。对于一个好的图形前端，我推荐kdiff3 (GPL)。

在Cygwin的指导下，唯一对我有用的是:

git config --global merge.tool myp4merge
git config --global mergetool.myp4merge.cmd 'p4merge.exe "$(cygpath -wla $BASE)" "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)" "$(cygpath -wla $MERGED)"'
git config --global diff.tool myp4diff
git config --global difftool.myp4diff.cmd 'p4merge.exe "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)"'

另外，我喜欢关闭difftool的提示信息:

git config --global difftool.prompt false

如果有人想在TortoiseGit上使用gvim作为他们的差异工具，那么你需要在文本输入中输入外部差异工具的路径:

path\to\gvim.exe -f -d -c "wincmd R" -c "wincmd R" -c "wincmd h" -c "wincmd J"