From: Bruno Haible <bruno@clisp.org>
Date: Sun, 30 Sep 2007 21:25:56 GMT
Subject: Re: GIT_EXTERNAL_DIFF invoked with undocumented calling convention after unstashing conflicts
Message-ID: <200709302325.56235.bruno@clisp.org>
In-Reply-To: <7vk5q7hqld.fsf@gitster.siamese.dyndns.org>

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