summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes-1.5.0.3.txt
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2007-03-03 20:34:27 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-05 00:47:32 (GMT)
commitef561ac7380cae589549237c804ad88e8dd449ef (patch)
tree3998ecb97043c51da9c8aa16f97cc23ca67760ad /Documentation/RelNotes-1.5.0.3.txt
parent365aa199196c8665e978ec7092323167621a69ea (diff)
downloadgit-ef561ac7380cae589549237c804ad88e8dd449ef.zip
git-ef561ac7380cae589549237c804ad88e8dd449ef.tar.gz
git-ef561ac7380cae589549237c804ad88e8dd449ef.tar.bz2
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 'Documentation/RelNotes-1.5.0.3.txt')
0 files changed, 0 insertions, 0 deletions