试图调用合并工具。之前已经设置了 mergetool 和 difftool。两者都遵循相同的过程。Difftool 有效,但 mergetool 无效。当我尝试调用 mergetool 时,我得到:
SAR@DESKTOP-7MC10MV MINGW64 ~/projects/starter-web (master|MERGING)
$ git mergetool
Merging:
simple.html
Normal merge conflict for 'simple.html':
{local}: modified file
{remote}: modified file
The merge tool p4merge is not available as 'C:\Program Files\Perforce'
我试过重做~/.gitconfig
,但它只是弹出与上面相同的错误。
[diff]
tool = p4merge
[difftool "p4merge"]
path = C:/Program Files/Perforce/p4merge.exe
[difftool]
prompt = false
[merge]
tool = p4merge
[mergetool "p4merge"]
path = C:/Program Files/Perforce/p4merge.exe
[mergetool]
prompt = false