系统环境:
OS: Windows
10
Git
2.6.1.windows.1
KDiff3
0.9.98 (
64 bit)
具体代码如下:
git config --global --
add merge
.tool kdiff3
git config --global --
add mergetool
.kdiff3
.path "C:/Program Files/KDiff3/kdiff3.exe"
git config --global --
add mergetool
.kdiff3
.trustExitCode false
git config --global --
add diff
.guitool kdiff3
git config --global --
add difftool
.kdiff3
.path "C:/Program Files/KDiff3/kdiff3.exe"
git config --global --
add difftool
.kdiff3
.trustExitCode false
查看git配置文件.gitconfig添加内容为:
[merge]
tool = kdiff3
[mergetool
"kdiff3"]
path =
C:/Program Files/
KDiff3/kdiff3.exe
trustExitCode =
false
[diff]
guitool = kdiff3
[difftool
"kdiff3"]
path =
C:/Program Files/
KDiff3/kdiff3.exe
trustExitCode =
false
转载请注明原文地址: https://ju.6miu.com/read-972121.html