Code

'git-merge': Documentation.
authorJunio C Hamano <junkio@cox.net>
Fri, 9 Sep 2005 08:15:47 +0000 (01:15 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 11 Sep 2005 01:30:42 +0000 (18:30 -0700)
commit0f69be537618036c45bc07919248b88afbf7af3e
treeb9d98fbff2a5b6ec4b17656eea6321b251b9a0b9
parent2276aa6c098a0337bc2bec49742e332bdd1b802c
'git-merge': Documentation.

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

Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-merge.txt [new file with mode: 0644]
Documentation/git.txt