tree 3998ecb97043c51da9c8aa16f97cc23ca67760ad
parent 365aa199196c8665e978ec7092323167621a69ea
author J. Bruce Fields <bfields@citi.umich.edu> 1172954067 -0500
committer Junio C Hamano <junkio@cox.net> 1173055652 -0800

user-manual: more detailed merge discussion

Add more details on conflict, including brief discussion of file stages.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>