doc: merge-options.adoc remove a misleading double negation

Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/merge-options.adoc b/Documentation/merge-options.adoc
index 9b3c7d6df4ef6d94436572246fbd70bfdbc08f51..078f4f6157a1af16596c4b6babbdfeae22640bb8 100644 (file)
--- a/Documentation/merge-options.adoc
+++ b/Documentation/merge-options.adoc
@@ -203,7 +203,7 @@ endif::git-pull[]
        used to override this safety when merging histories of two
        projects that started their lives independently. As that is
        a very rare occasion, no configuration variable to enable
-       this by default exists and will not be added.
+       this by default exists or will be added.
 ifdef::git-pull[]
 +
 Only useful when merging.