Andrew's git / gitweb.git / diff
?
Document git-merge-file
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Sat, 16 Dec 2006 11:22:18 +0000 (12:22 +0100)
committerJunio C Hamano <junkio@cox.net>
Sat, 16 Dec 2006 13:15:28 +0000 (05:15 -0800)
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>
No differences found