[英]Git difftool not working Windows 10 Git Bash
I installed diffmerge and pasted this into my .gitconfig
file in my C:/Users
folder.我安装了 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\"
But now when I use difftool
in git bash I get this但是现在当我在 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.py
The reason I got this problem was I didn't leave a space after sdgm.exe
in two different places.我遇到这个问题的原因是我在sdgm.exe
之后没有在两个不同的地方留下空格。
First one is in line number 4 where I wrote sdgm.exe\"LOCAL\"
instead it was supposed to be第一个在第 4 行,我写了sdgm.exe\"LOCAL\"
而不是它应该是
sdgm.exe \"LOCAL\"
. sdgm.exe \"LOCAL\"
。
And the second one is in line number 10 where I wrote sdgm.exe-merge
instead it was supposed to be第二个在第 10 行,我写了sdgm.exe-merge
而不是它应该是
sdgm.exe -merge
Thank You @ElpieKay and @quamrana for helping me.谢谢@ElpieKay和@quamrana帮助我。
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.