git mergetool失败了

Question

合并后,我想使用git mergetool来解决问题,但它失败了我指定的任何工具:

git mergetool                                                                                                          
 merge tool candidates: opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse ecmerge p4merge araxis bc3 vimdiff emerge
Merging:
main.c

Normal merge conflict for 'main.c':
  {local}: modified file
  {remote}: modified file
Hit return to start merge resolution tool (kdiff3):
merge of main.c failed

我指定的工具似乎根本没有启动.

输出

git config --list

merge.tool=kdiff3
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true

Answer 1

kdiff3可能没有安装在您的系统上.如果是,请检查您的PATH变量是否可用

尝试

git config --global merge.tool <your_merge_program>

此外,您还可以指定操作系统和可用的合并程序