From cbbb3b2d3897ea68f0d7ae441aec737e49586526 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-No=C3=ABl=20Avila?= Date: Sun, 25 May 2025 20:27:04 +0000 Subject: [PATCH] doc: merge-options.adoc remove a misleading double negation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jean-Noël Avila Signed-off-by: Junio C Hamano --- Documentation/merge-options.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/merge-options.adoc b/Documentation/merge-options.adoc index 9b3c7d6df4..078f4f6157 100644 --- 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. -- 2.47.3