![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Fri, 9 Sep 2005 08:15:47 +0000 (01:15 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 11 Sep 2005 01:30:42 +0000 (18:30 -0700) | ||
| commit | 0f69be537618036c45bc07919248b88afbf7af3e | |
| tree | b9d98fbff2a5b6ec4b17656eea6321b251b9a0b9 | tree | snapshot |
| parent | 2276aa6c098a0337bc2bec49742e332bdd1b802c | commit | diff |
'git-merge': Documentation.
... and add link from git.txt, as usual.
Signed-off-by: Junio C Hamano <junkio@cox.net>
... 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] | blob |
| Documentation/git.txt | diff | blob | history |