Fix mis-mark-up in git-merge-file.txt documentation

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-12-17 00:46:35 -08:00
parent a7f196a746
commit 38477d9e60

View File

@ -1,9 +1,9 @@
git-merge-file(1)
============
=================
NAME
----
git-merge-file - threeway file merge
git-merge-file - three-way file merge
SYNOPSIS