Subject: Re: GIT_EXTERNAL_DIFF invoked with undocumented calling convention after unstashing conflicts

From: Bruno Haible <[email-masked]>
Date: Sun, 30 Sep 2007 23:25:56 +0200

Junio C Hamano wrote:
> The script needs to decide how it wants to present an unmerged
> path; the information on each unmerged stages can be read from
> the output of "ls-files -u $thatpath".

Thanks for this info. This, and "git cat-file", did the trick.

Bruno