diff options
| author | Elijah Newren <newren@gmail.com> | 2023-03-21 06:25:58 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-21 10:56:52 -0700 |
| commit | 0b027f6ca79cafbc14f36ff1741fc7378282f295 (patch) | |
| tree | 8664359f8aadf94ee7cd79839244198e6cbd78d4 /builtin/merge-file.c | |
| parent | 7ee24e18e55f5459183189a793cb216fb50c20f8 (diff) | |
| download | git-0b027f6ca79cafbc14f36ff1741fc7378282f295.tar.gz | |
abspath.h: move absolute path functions from cache.h
This is another step towards letting us remove the include of cache.h in
strbuf.c. It does mean that we also need to add includes of abspath.h
in a number of C files.
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 ae45f523b9..c0096ee081 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c @@ -1,4 +1,5 @@ #include "builtin.h" +#include "abspath.h" #include "cache.h" #include "config.h" #include "gettext.h" |