merge-recursive: Mark some diff_filespec struct arguments const

diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt
index 50824e3a2d7d00370d7311088349da84ee23b728..30eca6cee62ad7b9ccfc9d71209a17287c65d48c 100644 (file)
--- a/Documentation/git-check-attr.txt
+++ b/Documentation/git-check-attr.txt
@@ -86,15 +86,6 @@ SEE ALSO
 --------
 linkgit:gitattributes[5].
 
-
-Author
-------
-Written by Junio C Hamano <gitster@pobox.com>
-
-Documentation
---------------
-Documentation by James Bowes.
-
 GIT
 ---
 Part of the linkgit:git[1] suite