From 38477d9e6055e3572b465ec3f8e716164111683d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 17 Dec 2006 00:46:35 -0800 Subject: [PATCH] Fix mis-mark-up in git-merge-file.txt documentation Signed-off-by: Junio C Hamano --- Documentation/git-merge-file.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- 2.11.0