我安装了diffmerge并将其粘贴到C:/Users文件夹中的.gitconfig文件中。
[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\"但是现在,当我在git bash中使用difftool时,我得到了如下结果
/mingw64/libexec/git-core/git-mergetool--lib: line 128: C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exeC:\Users\Anas\AppData\Local\Temp/hhqGyv_calc.py: No such file or directory
fatal: external diff died, stopping at calc.pyhttps://stackoverflow.com/questions/62830143
复制相似问题