Merge branch 'svn-fe' of git://repo.or.cz/git/jrn

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index c1efaaa5c52cd93e90a1a7427125e470f771146a..fb4c05b83f2c5b27598938416ea092da77e5c81d 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -312,15 +312,6 @@ linkgit:git-diff[1], linkgit:git-ls-files[1],
 linkgit:git-add[1], linkgit:git-rm[1],
 linkgit:git-mergetool[1]
 
-Author
-------
-Written by Junio C Hamano <gitster@pobox.com>
-
-
-Documentation
---------------
-Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite