我的.gitconfig
有:
...
[merge]
tool = BeyondCompare4
[diff]
guitool = beyondcompare4
[difftool "beyondcompare4"]
path = C:/Program Files/Beyond Compare 4/bcomp.exe
cmd = \"C:/Program Files/Beyond Compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\"
[mergetool "BeyondCompare4"]
path = C:/Program Files/Beyond Compare 4/bcomp.exe
cmd = \"C:/Program Files/Beyond Compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
但是,每当我运行git difftool ...
时,调用带有4个参数的git mergetool ...
命令,我就会得到3向合并视图而不是并排视图。
使用git difftool
时如何获得并排视图?
注意:我使用GitExtensions设置配置文件。