revised^2: git-daemon extra paranoia, and path DWIM

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index a48697ff3484d075669e77366de35727c2017e7a..a007a8b15a1a4598aabd844d09e45db65db6e3a5 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -1,6 +1,5 @@
 git-merge(1)
 ============
-v0.99.6, Sep 2005
 
 NAME
 ----
@@ -49,4 +48,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite