![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | J. Bruce Fields <bfields@citi.umich.edu> | |
| Sat, 3 Mar 2007 20:34:27 +0000 (15:34 -0500) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 5 Mar 2007 00:47:32 +0000 (16:47 -0800) | ||
| commit | ef561ac7380cae589549237c804ad88e8dd449ef | |
| tree | 3998ecb97043c51da9c8aa16f97cc23ca67760ad | tree | snapshot |
| parent | 365aa199196c8665e978ec7092323167621a69ea | commit | 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>
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>
| Documentation/user-manual.txt | diff | blob | history |