Merge branch 'fixes'

diff --git a/Documentation/git-resolve.txt b/Documentation/git-resolve.txt
index d0583181941bc88678f803953bbffe96836e992b..7d3eb79033ae857fdaa164d18ef5607fb91f38d0 100644 (file)
--- a/Documentation/git-resolve.txt
+++ b/Documentation/git-resolve.txt
@@ -33,5 +33,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