From: Junio C Hamano <junkio@cox.net>
Date: Fri, 9 Sep 2005 08:15:47 +0000 (-0700)
Subject: 'git-merge': Documentation.
X-Git-Tag: v0.99.7~81
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0f69be537618036c45bc07919248b88afbf7af3e?hp=0f69be537618036c45bc07919248b88afbf7af3e

'git-merge': Documentation.

... and add link from git.txt, as usual.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---