X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fmerge-options.txt;h=d64c259bb35d3140b371e8717a2553146d3f92f5;hb=065c5ac1688ca5cde826dc87d9791c2eedec7026;hp=56f1d8d69d05bb4aa26d0dad6e576332588090e8;hpb=e157938a92a795dec7b3b9e4fedd5b7dec87873c;p=git.git

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 56f1d8d69..d64c259bb 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -25,4 +25,3 @@
 	If there is no `-s` option, a built-in list of strategies
 	is used instead (`git-merge-recursive` when merging a single
 	head, `git-merge-octopus` otherwise).
-