Refactored merge options into separate merge-options.txt.

[thirdparty/git.git] / Documentation / git-merge.txt

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index b3ef19bae44268a3a2159f9ccfbce51314312ab7..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