environment.h: move declarations for environment.c functions from cache.h

[thirdparty/git.git] / merge-ort.c

diff --git a/merge-ort.c b/merge-ort.c
index a26cad5f910385951187b6b7808265b7abf8b44c..f3d7c202f5211020118cdf1a844784b383513c3f 100644 (file)
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -26,6 +26,7 @@
 #include "diff.h"
 #include "diffcore.h"
 #include "dir.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "entry.h"