diff options
Diffstat (limited to 'builtin/merge-file.c')
| -rw-r--r-- | builtin/merge-file.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin/merge-file.c b/builtin/merge-file.c index cb42865eb5..9464f27562 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c @@ -1,10 +1,13 @@ #define USE_THE_REPOSITORY_VARIABLE +#define DISABLE_SIGN_COMPARE_WARNINGS + #include "builtin.h" #include "abspath.h" #include "diff.h" #include "hex.h" +#include "object-file.h" #include "object-name.h" -#include "object-store.h" +#include "odb.h" #include "config.h" #include "gettext.h" #include "setup.h" |