diff options
Diffstat (limited to 'notes-merge.c')
| -rw-r--r-- | notes-merge.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/notes-merge.c b/notes-merge.c index 8a09cd9f77..c40107c3aa 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -1,10 +1,12 @@ #include "cache.h" #include "commit.h" +#include "gettext.h" #include "refs.h" #include "object-store.h" #include "repository.h" #include "diff.h" #include "diffcore.h" +#include "hex.h" #include "xdiff-interface.h" #include "ll-merge.h" #include "dir.h" @@ -13,6 +15,7 @@ #include "strbuf.h" #include "notes-utils.h" #include "commit-reach.h" +#include "wrapper.h" struct notes_merge_pair { struct object_id obj, base, local, remote; |