diff options
| author | Todd Zullinger <tmz@pobox.com> | 2025-03-03 15:44:31 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-03-03 13:49:27 -0800 |
| commit | d6b67cefb5c27d1479d41a8fae1a03b8aece82f6 (patch) | |
| tree | 5fbba65699bfaab42e5e315d8f78815fbe2adee4 /unpack-trees.c | |
| parent | ee00ef41f269bda33370acbacb41f5ca9a200a9b (diff) | |
| download | git-d6b67cefb5c27d1479d41a8fae1a03b8aece82f6.tar.gz | |
unpack-trees.c: *.txt -> *.adoc fixes
Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, |