From: Junio C Hamano <junkio@cox.net>
Date: Tue, 7 Jun 2005 21:35:43 +0000 (-0700)
Subject: [PATCH] read-tree: update documentation for 3-way merge.
X-Git-Tag: v0.99~323
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ccef66b55a6a2eb2c5f6a9dd29a86b181df21af9?ds=inline;hp=ccef66b55a6a2eb2c5f6a9dd29a86b181df21af9

[PATCH] read-tree: update documentation for 3-way merge.

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>
---