freshlybakedca.ke / git
Git fork
fork atom

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

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

authored by

Todd Zullinger and committed by
Junio C Hamano d6b67cef ee00ef41

+1 -1
unified split
+1 -1
unpack-trees.c
··· 2904 * The rule is to "carry forward" what is in the index without losing 2905 * information across a "fast-forward", favoring a successful merge 2906 * over a merge failure when it makes sense. For details of the 2907 - * "carry forward" rule, please see <Documentation/git-read-tree.txt>. 2908 * 2909 */ 2910 int twoway_merge(const struct cache_entry * const *src,
··· 2904 * The rule is to "carry forward" what is in the index without losing 2905 * information across a "fast-forward", favoring a successful merge 2906 * over a merge failure when it makes sense. For details of the 2907 + * "carry forward" rule, please see <Documentation/git-read-tree.adoc>. 2908 * 2909 */ 2910 int twoway_merge(const struct cache_entry * const *src,