我不知道我是怎么做到这一点的,我试图将kdiff3设置为我的合并工具,但当我编写git config --global mergetool kdiff3时,我得到了这个错误key does not contain a section: mergetool,我检查了我的配置列表,并取消了我在其中的mergetool配置,所以我现在得到的是:
$ git config --list
core.symlinks=false
core.autocrlf=true
core.fscache=true
color.diff=auto
color.status=auto
color.branch=auto
color.interactive=true
help.format=html
http.sslcainfo=C:/Program Files/Git/mingw64/ssl/certs/ca-bundle.crt
diff.astextplain.textconv=astextplain
rebase.autosquash=true
credential.helper=manager
user.email=nick@anideaforanapp.com
user.name=Naguib Ihab
core.repositoryformatversion=0
core.filemode=false
core.bare=false
core.logallrefupdates=true
core.symlinks=false
core.ignorecase=true
remote.origin.url=https://omitted
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
branch.master.remote=origin
branch.master.merge=refs/heads/master
branch.report-visualisation.remote=origin
branch.report-visualisation.merge=refs/heads/report-visualisation
branch.report-visualisation_nvd3.remote=origin
branch.report-visualisation_nvd3.merge=refs/heads/report-visualisation_nvd3你知道我怎么解决这个问题吗?
发布于 2018-01-22 11:24:38
试试git config --global merge.tool kdiff3。
关键的mergetool用于配置one merge工具,如mergetool.kdiff3.path
https://stackoverflow.com/questions/48374219
复制相似问题