kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Todd Zullinger 2025-03-03 15:44:31 -05:00 committed by Junio C Hamano
parent ee00ef41f2
commit d6b67cefb5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
unpack-trees.c
View File

@ -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,