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

jnavila · gitster · commit cbbb3b2d3897 · 2025-05-27T07:51:00.000-07:00
Signed-off-by: Jean-Noël Avila &lt;jn.avila@free.fr&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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.

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ endif::git-pull[]`
`203`	`203`	`used to override this safety when merging histories of two`
`204`	`204`	`projects that started their lives independently. As that is`
`205`	`205`	`a very rare occasion, no configuration variable to enable`
`206`		`- this by default exists and will not be added.`
	`206`	`+ this by default exists or will be added.`
`207`	`207`	`ifdef::git-pull[]`
`208`	`208`	`+`
`209`	`209`	`Only useful when merging.`