commit | ef561ac7380cae589549237c804ad88e8dd449ef | [log] [tgz] |
---|---|---|
author | J. Bruce Fields <bfields@citi.umich.edu> | Sat Mar 03 15:34:27 2007 -0500 |
committer | Junio C Hamano <junkio@cox.net> | Sun Mar 04 16:47:32 2007 -0800 |
tree | 3998ecb97043c51da9c8aa16f97cc23ca67760ad | |
parent | 365aa199196c8665e978ec7092323167621a69ea [diff] |
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>