diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2007-03-03 15:34:27 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-04 16:47:32 -0800 |
| commit | ef561ac7380cae589549237c804ad88e8dd449ef (patch) | |
| tree | 3998ecb97043c51da9c8aa16f97cc23ca67760ad /diff.h | |
| parent | 365aa199196c8665e978ec7092323167621a69ea (diff) | |
| download | git-ef561ac7380cae589549237c804ad88e8dd449ef.tar.gz | |
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>
Diffstat (limited to 'diff.h')
0 files changed, 0 insertions, 0 deletions