Merge branch 'lt/racy-empty' into maint

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index ef1f055c8574e928c8e05c820f2f1cc962e3d422..55bc3674797366496d7c1ca1f5b6564b06c01de1 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -168,4 +168,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite