diff options
Diffstat (limited to 'merge-blobs.c')
| -rw-r--r-- | merge-blobs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-blobs.c b/merge-blobs.c index 5632ff6abb..9293cbf75c 100644 --- a/merge-blobs.c +++ b/merge-blobs.c @@ -1,10 +1,10 @@ #include "git-compat-util.h" #include "run-command.h" #include "xdiff-interface.h" -#include "ll-merge.h" +#include "merge-ll.h" #include "blob.h" #include "merge-blobs.h" -#include "object-store.h" +#include "object-store-ll.h" static int fill_mmfile_blob(mmfile_t *f, struct blob *obj) { |