Cannot use `git mergetool` with `git am` or `git apply` or `patch`

Question

git mergetool is wonderful (in my case, I use kdiff3). However, it is not possible to use it to resolve conflicts from git am or git apply (or even with patch command). Indeed, mergetool need 3 files to work (base and both modified versions) while git am work with a modified version and a patch.

Do you know a way to use git mergetool for conflicts produced with git am?

I think it is necessary to guess the base file from modified version and patch. If you consider each chunk separately, it looks tricky, but not impossible.

Answer 1

As torek mentions, git mergetool will be involved if you are:

• doing a git am --3way
• doing a regular git am, but with the config am.threeWay set to true.

The issue remains for a regular patch command.