diff options
Diffstat (limited to 'merge-ort.c')
-rw-r--r-- | merge-ort.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/merge-ort.c b/merge-ort.c index a50b095c47..8631c99700 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -14,7 +14,7 @@ * "cale", "peedy", or "ins" instead of "ort"?) */ -#include "cache.h" +#include "git-compat-util.h" #include "merge-ort.h" #include "alloc.h" @@ -30,14 +30,17 @@ #include "gettext.h" #include "hex.h" #include "entry.h" -#include "ll-merge.h" +#include "merge-ll.h" #include "match-trees.h" #include "mem-pool.h" #include "object-name.h" -#include "object-store.h" +#include "object-store-ll.h" #include "oid-array.h" +#include "path.h" #include "promisor-remote.h" +#include "read-cache-ll.h" #include "revision.h" +#include "sparse-index.h" #include "strmap.h" #include "submodule-config.h" #include "submodule.h" |