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

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

Fix mis-mark-up in git-merge-file.txt documentation
Signed-off-by: N Junio C Hamano <junkio@cox.net>
38477d9e · Junio C Hamano · a7f196a7 · 38477d9e
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

Documentation/git-merge-file.txt Documentation/git-merge-file.txt +2 -2

未找到文件。
--- a/Documentation/git-merge-file.txt
+++ b/Documentation/git-merge-file.txt
 git-merge-file(1)
-============
+=================

 NAME
 ----
-git-merge-file - threeway file merge
+git-merge-file - three-way file merge


 SYNOPSIS