git maintenance: avoid console window in scheduled tasks on Windows

[thirdparty/git.git] / merge.c

diff --git a/merge.c b/merge.c
index da7fa652c271b7990f5f6d1d82abb63dc8341261..10aaec3a6c1afca8fef4e3aac3dcd0d1cd2b9f63 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -7,6 +7,7 @@
 #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"