| commit | 528fc51b6d899e080a877f9420efcca86c98b35e | |
| author | Elijah Newren <newren@gmail.com> | |
| Fri, 16 Jul 2021 05:22:32 +0000 (16 05:22 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 20 Jul 2021 21:47:39 +0000 (20 14:47 -0700) | ||
| tree | 123e14ef8a85b3ac2e56b97637cc044eafae9236 | treesnapshot (tar.gz zip) |
| parent | 785bf2088e54ed8a450edb5c7371286ff6405605 | commitdiff |
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>
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>
| merge-ort.c | diffblobblamehistory |