git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 365aa19)
user-manual: more detailed merge discussion
authorJ. Bruce Fields <redacted>
Sat, 3 Mar 2007 20:34:27 +0000 (15:34 -0500)
committerJunio C Hamano <redacted>
Mon, 5 Mar 2007 00:47:32 +0000 (16:47 -0800)
commitef561ac7380cae589549237c804ad88e8dd449ef
tree3998ecb97043c51da9c8aa16f97cc23ca67760adtree | snapshot
parent365aa199196c8665e978ec7092323167621a69eacommit | diff
user-manual: more detailed merge discussion

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

Signed-off-by: "J. Bruce Fields" <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/user-manual.txt diff | blob | history
git clone https://git.99rst.org/PROJECT