我在我的.gitconfig
文件中有以下内容:
[user]
name = myname
email = myname@gmail.com
[core]
autocrlf = true
excludesfile = C:\\Users\\myname\\Documents\\gitignore_global.txt
[diff]
tool = meld
[difftool "meld"]
cmd = "C:/Program Files (x86)/Meld/meld/meld.exe"
prompt = false
[merge]
tool = meld
[mergetool "meld"]
cmd = "C:/Program Files (x86)/Meld/meld/meld.exe"
[difftool "sourcetree"]
cmd = "C:/Program Files (x86)/Meld/meld/meld.exe $PWD/$LOCAL $PWD/$BASE $PWD/$REMOTE"
[mergetool "sourcetree"]
cmd = 'C:/Program Files (x86)/Meld/meld/meld.exe' \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = true
在 Sourcetree 中,我的设置如下:
然而,当我在 Sourcetree 上右键单击文件以进行外部 diff 时,我能够打开 Meld,但是文件的内容根本没有显示出来。
我的设置做错了什么?
$LOCAL $BASE $REMOTE --auto-merge --output=$MERGED
- Jonathan