Fix mis-mark-up in git-merge-file.txt documentation
authorJunio C Hamano <junkio@cox.net>
Sun, 17 Dec 2006 08:46:35 +0000 (00:46 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 17 Dec 2006 09:14:44 +0000 (01:14 -0800)
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-merge-file.txt

index 0b41d66a70dd7e36854bcc10706202bd4e1880a1..29d3faa556f8e7148edd9f01d1ffa870e78502b8 100644 (file)
@@ -1,9 +1,9 @@
 git-merge-file(1)
-============
+=================
 
 NAME
 ----
-git-merge-file - threeway file merge
+git-merge-file - three-way file merge
 
 
 SYNOPSIS