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>
Jean-Noël Avila committed
May 25, 2025 at 20:27 UTC
cbbb3b2d3897ea68f0d7ae441aec737e49586526
1 file changed
+1
-1
Documentation/merge-options.adoc
+1
-1
@@ -203,7 +203,7 @@ endif::git-pull[]
203
used to override this safety when merging histories of two
204
projects that started their lives independently. As that is
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
ifdef::git-pull[]
208
+
209
Only useful when merging.