"Kelvie Wong" <kelvie@xxxxxxxx> writes:
> I've tried all of the ones that were supported, the result is the same
> -- blank files in all three windows.
>
> It is because git mergetool fails to generate these files for whatever
> reason (the filebasename.{REMOTE,LOCAL,BASE}.* files). I don't know
> why this happens.
Can you run git-mergetool under "sh -x"?
That is,
$ sh -x git-mergetool
around ll.160-170 these files are created.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
