我一直在尝试设置kdiff3命令行参数,但是GitExtensions设置仍然是错误。目前,我的git配置为:
[merge]
tool = kdiff3
[diff]
guitool = kdiff3
[core]
editor = \"C:/Program Files (x86)/GitExtensions/GitExtensions.exe\" fileeditor
[user]
name = xxxxxxxx
email = xxxxxxxxxxxxxxxxx.com
[pull]
rebase = false
[fetch]
prune = false
[rebase]
autoStash = false
[difftool "kdiff3"]
path = C:/Program Files/KDiff3
trustExitCode = false
cmd = kdiff3.exe \"`echo $LOCAL | sed 's_^/(/mnt/)/?//([a-z]/)/_/2:/_'`\" \"`echo $REMOTE |
sed 's_^/(/mnt/)/?//([a-z]/)/_/2:/_'`\"
[mergetool "kdiff3"]
path = C:/Program Files/KDiff3
trustExitCode = false
cmd = \"C://Program Files (x86)//KDiff3//kdiff3\" $BASE $LOCAL $REMOTE -o $MERGED
但是,在Git Extensions设置中,我仍然显示配置错误...
不用说,修复按钮不会执行任何操作,因此命令的设置方式一定存在问题。谁能告诉我需要做些什么才能使其正确?
谢谢。