X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=904e2fc4c5d1d2748e8f34b8df977a88f23233fd;hb=4e72dcec89c7cda7022d4ec2dd686e77deb5376e;hp=b3ef19bae44268a3a2159f9ccfbce51314312ab7;hpb=bb73d73c0885fce357e0d70aa51c2215a8e38a4e;p=git.git

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