diff options
| author | Elijah Newren <newren@gmail.com> | 2023-03-21 07:26:05 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-21 18:56:54 +0100 |
| commit | e38da487cc50ce4b5b48085eebcab8268c541579 (patch) | |
| tree | ba03426b327b19dfbf5041c788b4f606f2da70a7 /builtin/merge-file.c | |
| parent | treewide: remove cache.h inclusion due to environment.h changes (diff) | |
| download | git-e38da487cc50ce4b5b48085eebcab8268c541579.tar.xz git-e38da487cc50ce4b5b48085eebcab8268c541579.zip | |
setup.h: move declarations for setup.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 'builtin/merge-file.c')
| -rw-r--r-- | builtin/merge-file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge-file.c b/builtin/merge-file.c index c0096ee081..781818d08f 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c @@ -3,6 +3,7 @@ #include "cache.h" #include "config.h" #include "gettext.h" +#include "setup.h" #include "xdiff/xdiff.h" #include "xdiff-interface.h" #include "parse-options.h" |