From: Junio C Hamano <junkio@cox.net>
Date: Sun, 17 Dec 2006 08:46:35 +0000 (-0800)
Subject: Fix mis-mark-up in git-merge-file.txt documentation
X-Git-Tag: v1.5.0-rc0~87
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=38477d9e6055e3572b465ec3f8e716164111683d;p=git.git

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

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt
index 0b41d66a7..29d3faa55 100644
--- a/Documentation/git-merge-file.txt
+++ b/Documentation/git-merge-file.txt
@@ -1,9 +1,9 @@
 git-merge-file(1)
-============
+=================
 
 NAME
 ----
-git-merge-file - threeway file merge
+git-merge-file - three-way file merge
 
 
 SYNOPSIS