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>
Elijah Newren committed
Dec 3, 2020 at 15:59 UTC
67845745c1ab7dcce72116fb58f99630d14e12cc
1 file changed
+2
merge-ort.c
+2
@@ -17,7 +17,9 @@
17
#include "cache.h"
18
#include "merge-ort.h"
19
20
+#include "blob.h"
21
#include "cache-tree.h"
22
+#include "commit-reach.h"
23
#include "diff.h"
24
#include "diffcore.h"
25
#include "dir.h"