diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-12-03 15:59:40 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-12-13 14:21:03 -0800 |
| commit | 67845745c1ab7dcce72116fb58f99630d14e12cc (patch) | |
| tree | e1a0a38fd9c4cc97487b454598f3315934336b30 | |
| parent | merge-ort: free data structures in merge_finalize() (diff) | |
| download | tgif-67845745c1ab7dcce72116fb58f99630d14e12cc.tar.xz | |
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>
| -rw-r--r-- | merge-ort.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/merge-ort.c b/merge-ort.c index 51b049358e..ba3ce8d5d5 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -17,7 +17,9 @@ #include "cache.h" #include "merge-ort.h" +#include "blob.h" #include "cache-tree.h" +#include "commit-reach.h" #include "diff.h" #include "diffcore.h" #include "dir.h" |