summaryrefslogtreecommitdiffstats
path: root/merge-ort.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2023-03-21 07:26:03 +0100
committerJunio C Hamano <gitster@pobox.com>2023-03-21 18:56:53 +0100
commit32a8f510614312cc8b81bbc6a982d08ab7562ab4 (patch)
tree4633d5e03c17b0f6fd429a6b0847ed1d27857e40 /merge-ort.c
parenttreewide: remove unnecessary includes of cache.h (diff)
downloadgit-32a8f510614312cc8b81bbc6a982d08ab7562ab4.tar.xz
git-32a8f510614312cc8b81bbc6a982d08ab7562ab4.zip
environment.h: move declarations for environment.c functions from cache.h
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-ort.c')
-rw-r--r--merge-ort.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-ort.c b/merge-ort.c
index a26cad5f91..f3d7c202f5 100644
--- 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"