diff options
Diffstat (limited to 'merge.c')
-rw-r--r-- | merge.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1,10 +1,13 @@ #include "cache.h" #include "diff.h" #include "diffcore.h" +#include "gettext.h" +#include "hex.h" #include "lockfile.h" #include "commit.h" #include "run-command.h" #include "resolve-undo.h" +#include "tree.h" #include "tree-walk.h" #include "unpack-trees.h" #include "dir.h" |