picca <picca@xxxxxxxxxxxxxxxxxxxxx> 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. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
