kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
7,233 Commits
6 Branches
978 Tags
162 MiB
Commit Graph

2 Commits (08a19d873c16aa6127bf4c40cf99a9dd19558a0c)

Author SHA1 Message Date
Junio C Hamano 38477d9e60 Fix mis-mark-up in git-merge-file.txt documentation 
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2006-12-17 01:14:44 -08:00
Johannes Schindelin 9abaa7f033 Document git-merge-file 
Most of this is derived from the documentation of RCS merge.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2006-12-16 05:15:28 -08:00