Tutorial: do not use 'git resolve'.

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index fc37ea7412ad5976ccaef0e198a19b5bf1ffe057..cadaf59455c994c5c08fbdb84f9c0ed1bc974325 100644 (file)
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -48,5 +48,5 @@ 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