From: Junio C Hamano <junkio@cox.net>
Date: Tue, 15 May 2007 21:47:51 GMT
Subject: Re: newby question about merge.
Message-ID: <7vabw5iws8.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20070515133720.20d76042@localhost.localdomain>

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.

Regardlessly, I think it is a good idea to refer to it in SEE
ALSO section, just in case the user hasn't read the user manual
before reading the git-merge manpage.