diff options
| author | Elijah Newren <newren@gmail.com> | 2023-03-21 06:26:03 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-21 10:56:53 -0700 |
| commit | 32a8f510614312cc8b81bbc6a982d08ab7562ab4 (patch) | |
| tree | 4633d5e03c17b0f6fd429a6b0847ed1d27857e40 /merge-recursive.c | |
| parent | treewide: remove unnecessary includes of cache.h (diff) | |
| download | git-32a8f510614312cc8b81bbc6a982d08ab7562ab4.tar.gz 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-recursive.c')
| -rw-r--r-- | merge-recursive.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index f918cea4c6..d5f3772491 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -17,6 +17,7 @@ #include "diff.h" #include "diffcore.h" #include "dir.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "ll-merge.h" |