git difftool打开合并工具视图
Mygit difftool打开合并工具视图,git,Git,My.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\" \"$REMOT
.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设置配置文件。Windows不区分大小写。例如,尝试将
merge.tool
的值修改为bc4
,将[mergetool“BeyondCompare4”]
的值修改为[mergetool“bc4”]
。这就成功了!我将[difftool“beyondcompare4”]
更改为[difftool“beyondcompare4”]
谢谢!