Andrew's git / gitweb.git / blobdiff
?
Merge branch 'maint'
[gitweb.git] / Documentation / merge-options.txt
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 56f1d8d69d05bb4aa26d0dad6e576332588090e8..d64c259bb35d3140b371e8717a2553146d3f92f5 100644 (file)
--- 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).
-