git mergetool fails

Question

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

Ribtoks · Accepted Answer · 2012-06-21T11:53:11.847

5

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

edited Jun 21 '12 at 11:53

answered Jun 21 '12 at 11:45

Ribtoks

6,634
1
25
37

I have kdiff3, meld, gvimdiff (7.2),... and neither seems to work. I am working on RH4 – Paul Praet Jun 21 '12 at 11:50
Please, add your `git config --list` output, probably, without your email/password/etc private details – Ribtoks Jun 21 '12 at 11:52
I assume you run it under linux? – Ribtoks Jun 21 '12 at 11:53
merge.tool=kdiff3 core.repositoryformatversion=0 core.filemode=true core.bare=false core.logallrefupdates=true – Paul Praet Jun 21 '12 at 11:55
1

Have you tried to run your mergetool in terminal? (I mean without git). If you can't, then check if it is in your `$PATH` by `echo $PATH` – Ribtoks Jun 21 '12 at 11:57
There was indeed an issue there. Thanks, Ribtoks ! – Paul Praet Jun 21 '12 at 13:35
For anyone finding this via Google, `` is NOT a path to your merge program. See [here](http://stackoverflow.com/a/436040/33080) for a complete example of how to configure your merge tool. – Roman Starkov Apr 10 '13 at 18:59

score 1 · Answer 2 · answered Aug 22 '16 at 08:03

Note that git 2.10 will offer a better exit status to identify diff/merge tool installation issue.

See commit 45a4f5d (15 Aug 2016) by John Keeping (johnkeeping).
^{(Merged by Junio C Hamano -- gitster -- in commit 331f06d, 19 Aug 2016)}

difftool: always honor fatal error exit codes

At the moment difftool's "trust exit code" logic always suppresses the exit status of the diff utility we invoke.
This is useful because we don't want to exit just because diff returned "1" because the files differ, but it's confusing if the shell returns an error because the selected diff utility is not found.

POSIX specifies

127 as the exit status for "command not found",

126 for "command found but is not executable" and

values greater than 128 if the command terminated because it received a signal

At least bash and dash follow this specification, while diff utilities generally use "1" for the exit status we want to ignore.

Handle any value of 126 or greater as a special value indicating that some form of fatal error occurred.

git mergetool fails

2 Answers2

`difftool`: always honor fatal error exit codes

git mergetool fails

2 Answers2

difftool: always honor fatal error exit codes

`difftool`: always honor fatal error exit codes