development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
7421 commits 6 branches 951 tags 511 MiB
Commit graph

2 commits

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