Merge branch 'jc/ident' into next

diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt
index b84d14d8b627db6f19720c764f79a5347da65ace..86aad37c6acaf0c37995221456bffc61ed3bc883 100644 (file)
--- a/Documentation/git-merge-one-file.txt
+++ b/Documentation/git-merge-one-file.txt
@@ -1,6 +1,5 @@
 git-merge-one-file(1)
 =====================
-v0.99.4, Aug 2005
 
 NAME
 ----
@@ -27,5 +26,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite