X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=55bc3674797366496d7c1ca1f5b6564b06c01de1;hb=c30e699fc509f43f459c17d3148e7d866fb9157a;hp=ef1f055c8574e928c8e05c820f2f1cc962e3d422;hpb=c74815261225e5068490583b08303d158837ab9e;p=git.git diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index ef1f055c8..55bc36747 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -168,4 +168,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite