[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    Re: GIT_EXTERNAL_DIFF invoked with undocumented calling convention after unstashing conflicts
From:       Bruno Haible <bruno () clisp ! org>
Date:       2007-09-30 21:25:56
Message-ID: 200709302325.56235.bruno () clisp ! org
[Download RAW message or body]

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

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]