After a merge I want to use git mergetool to resolve the issue but it fails with whatever tool I specify:
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
The tool I specify doesn't seem to be launched at all.
Output of
git config --list
merge.tool=kdiff3 core.repositoryformatversion=0 core.filemode=true core.bare=false core.logallrefupdates=true
kdiff3
maybe not installed at your system. If it is, please, check if it is available through your PATH
variable
Try
git config --global merge.tool <your_merge_program>
Also, you can specify your operating system and available merge programs