From: Todd Zullinger Date: Mon, 03 Mar 2025 20:44:31 GMT Subject: [PATCH 33/34] unpack-trees.c: *.txt -> *.adoc fixes Message-ID: <20250303204443.360595-34-tmz@pobox.com> In-Reply-To: <20250303204443.360595-1-tmz@pobox.com> Signed-off-by: Todd Zullinger --- unpack-trees.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unpack-trees.c b/unpack-trees.c index 334cb84f65..cf5b73c84b 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -2904,7 +2904,7 @@ int threeway_merge(const struct cache_entry * const *stages, * The rule is to "carry forward" what is in the index without losing * information across a "fast-forward", favoring a successful merge * over a merge failure when it makes sense. For details of the - * "carry forward" rule, please see . + * "carry forward" rule, please see . * */ int twoway_merge(const struct cache_entry * const *src, -- 2.49.0.rc0