Merge branch 'master'

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 3e058db996cbb1200fc304b3a090cbd4e13fce80..904e2fc4c5d1d2748e8f34b8df977a88f23233fd 100644 (file)
--- 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,6 +34,8 @@ 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
 --------