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

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-mirror · Dec 17, 2006 · 38477d9 · 38477d9
1 parent a7f196a
commit 38477d9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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