From: picca <picca@synchrotron-soleil.fr>
Date: Wed, 16 May 2007 06:33:35 GMT
Subject: Re: newby question about merge.
Message-ID: <20070516083335.106667c5@localhost.localdomain>
In-Reply-To: <7vabw5iws8.fsf@assigned-by-dhcp.cox.net>

On Tue, 15 May 2007 14:47:51 -0700
Junio C Hamano <junkio@cox.net> wrote:

> picca <picca@synchrotron-soleil.Fr> writes:
> 
> > Is it possible to add this git cat-file -p :2:filename > filename in
> > the man page of git-merge in the resolve conflict part ?
> >
> > Or a link to the documentation speaking of this stage part.
> 
> See:
> 
> http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#conflict-resolution
> 
> As this walk through section from the user manual's already
> talks about it, I am not sure if we would want to duplicate its
> wording in git-merge manual page.

I had already red this manual but did not catch up that the :2:configure
was the git path of the files I want to retreive. In fact I was missing
the git-cat-file part and the git path.


regards, frederic