'git-merge': Documentation.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 567d41a6bfb2aad4b852b86abd49511fed5ac6a1..aabc774961e90963562d92fe7fc0f299802483d3 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -257,6 +257,9 @@ link:git-ls-remote.html[git-ls-remote]::
        Shows references in a remote or local repository.
        Previously this command was known as git-ls-remote-script.
 
+link:git-merge.html[git-merge]::
+       Grand unified merge driver.
+
 link:git-octopus.html[git-octopus]::
        Merge more than two commits.
        Previously this command was known as git-octopus-script.