diff options
Diffstat (limited to 'merge.c')
-rw-r--r-- | merge.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1,10 +1,13 @@ -#include "cache.h" +#include "git-compat-util.h" #include "diff.h" #include "diffcore.h" #include "gettext.h" +#include "hash.h" #include "hex.h" #include "lockfile.h" +#include "merge.h" #include "commit.h" +#include "repository.h" #include "run-command.h" #include "resolve-undo.h" #include "tree.h" |