[PATCH] read-tree: update documentation for 3-way merge.
authorJunio C Hamano <junkio@cox.net>
Tue, 7 Jun 2005 21:35:43 +0000 (14:35 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 7 Jun 2005 22:13:24 +0000 (15:13 -0700)
This explains the new merge world order that formally assigns
specific meaning to each of three tree-ish command line
arguments. It also mentions -u option

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
No differences found