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

tmzullinger · gitster · commit d6b67cefb5c2 · 2025-03-03T13:49:27.000-08:00
Signed-off-by: Todd Zullinger &lt;tmz@pobox.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -2904,7 +2904,7 @@ int threeway_merge(const struct cache_entry * const *stages,`
`2904`	`2904`	`* The rule is to "carry forward" what is in the index without losing`
`2905`	`2905`	`* information across a "fast-forward", favoring a successful merge`
`2906`	`2906`	`* over a merge failure when it makes sense. For details of the`
`2907`		`- * "carry forward" rule, please see <Documentation/git-read-tree.txt>.`
	`2907`	`+ * "carry forward" rule, please see <Documentation/git-read-tree.adoc>.`
`2908`	`2908`	`*`
`2909`	`2909`	`*/`
`2910`	`2910`	`int twoway_merge(const struct cache_entry * const *src,`