diff options
Diffstat (limited to 'notes-merge.c')
| -rw-r--r-- | notes-merge.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/notes-merge.c b/notes-merge.c index c40107c3aa..071947894e 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -1,18 +1,23 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "advice.h" #include "commit.h" #include "gettext.h" #include "refs.h" -#include "object-store.h" +#include "object-file.h" +#include "object-name.h" +#include "object-store-ll.h" +#include "path.h" #include "repository.h" #include "diff.h" #include "diffcore.h" #include "hex.h" #include "xdiff-interface.h" -#include "ll-merge.h" +#include "merge-ll.h" #include "dir.h" #include "notes.h" #include "notes-merge.h" #include "strbuf.h" +#include "trace.h" #include "notes-utils.h" #include "commit-reach.h" #include "wrapper.h" |