Merge branch 'jk/noetcconfig'

diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt
index 712739777b6c98449d2efdd5b6ce31724f3f5db6..ee95df3bc07874bb74b77899f113830b943066f6 100644 (file)
--- a/Documentation/git-merge-one-file.txt
+++ b/Documentation/git-merge-one-file.txt
@@ -1,10 +1,9 @@
 git-merge-one-file(1)
 =====================
-v0.99.4, Aug 2005
 
 NAME
 ----
-git-merge-one-file - The standard helper program to use with "git-merge-index"
+git-merge-one-file - The standard helper program to use with git-merge-index
 
 
 SYNOPSIS
@@ -27,5 +26,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
-
+Part of the linkgit:git[7] suite