summaryrefslogtreecommitdiff
path: root/t/t5100/info0018
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-07-16 05:22:32 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-07-20 14:47:39 -0700
commit528fc51b6d899e080a877f9420efcca86c98b35e (patch)
tree123e14ef8a85b3ac2e56b97637cc044eafae9236 /t/t5100/info0018
parentmerge-ort: resolve paths early when we have sufficient information (diff)
downloadtgif-528fc51b6d899e080a877f9420efcca86c98b35e.tar.xz
merge-ort: add some more explanations in collect_merge_info_callback()
The previous patch possibly raises some questions about whether additional cases in collect_merge_info_callback() can be handled early. Add some explanations in the form of comments to help explain these better. While we're at it, add a few comments to denote what a few boolean '0' or '1' values stand for. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5100/info0018')
0 files changed, 0 insertions, 0 deletions