From: Todd Zullinger <tmz@pobox.com>
Date: Mon, 3 Mar 2025 20:44:31 +0000 (-0500)
Subject: unpack-trees.c: *.txt -> *.adoc fixes
X-Git-Tag: v2.49.0-rc2~4^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6b67cefb5c27d1479d41a8fae1a03b8aece82f6;p=thirdparty%2Fgit.git

unpack-trees.c: *.txt -> *.adoc fixes

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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 <Documentation/git-read-tree.txt>.
+ * "carry forward" rule, please see <Documentation/git-read-tree.adoc>.
  *
  */
 int twoway_merge(const struct cache_entry * const *src,