From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Sat, 16 Dec 2006 11:22:18 +0000 (+0100)
Subject: Document git-merge-file
X-Git-Tag: v1.5.0-rc0~93
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9abaa7f033283f84ba8372192f9d4a165fb09ce4?ds=sidebyside;hp=9abaa7f033283f84ba8372192f9d4a165fb09ce4

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>
---