| commit | 67845745c1ab7dcce72116fb58f99630d14e12cc | |
| author | Elijah Newren <newren@gmail.com> | |
| Thu, 3 Dec 2020 15:59:40 +0000 (3 15:59 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 13 Dec 2020 22:21:03 +0000 (13 14:21 -0800) | ||
| tree | e1a0a38fd9c4cc97487b454598f3315934336b30 | treesnapshot (tar.gz zip) |
| parent | 89422d29b1d63004683aaa6d11faa65ba734d46f | commitdiff |
merge-ort: add a few includes
Include blob.h for definition of blob_type, and commit-reach.h for
declarations of get_merge_bases() and in_merge_bases(). While none of
these are used yet, we want to avoid cross-dependencies in the next
three series of patches for merge-ort and merge them at the end; adding
these "#include"s now avoids textual conflicts.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Include blob.h for definition of blob_type, and commit-reach.h for
declarations of get_merge_bases() and in_merge_bases(). While none of
these are used yet, we want to avoid cross-dependencies in the next
three series of patches for merge-ort and merge them at the end; adding
these "#include"s now avoids textual conflicts.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-ort.c | diffblobblamehistory |