X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=904e2fc4c5d1d2748e8f34b8df977a88f23233fd;hb=7b8999674955b9d6b58de2b8f71b2e2ede795f65;hp=da6537d9110ced743c42cba99111923a0753eb6d;hpb=3746501664e3fcf6c44080cb599b50bf9cbea2be;p=git.git

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index da6537d9..904e2fc4 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -19,7 +19,7 @@ which drives multiple merge strategy scripts.
 
 OPTIONS
 -------
-include::merge-pull-opts.txt[]
+include::merge-options.txt[]
 
 <msg>::
 	The commit message to be used for the merge commit (in case
@@ -34,10 +34,12 @@ include::merge-pull-opts.txt[]
 	least one <remote>.  Specifying more than one <remote>
 	obviously means you are trying an Octopus.
 
+include::merge-strategies.txt[]
+
 
 SEE ALSO
 --------
-gitlink:git-fmt-merge-msg[1]
+gitlink:git-fmt-merge-msg[1], gitlink:git-pull[1]
 
 
 Author