diff options
| author | Elijah Newren <newren@gmail.com> | 2023-04-11 09:41:53 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-11 17:52:10 +0200 |
| commit | 87bed17907b2cb9a9581a5b8b16b8da264c2a2a8 (patch) | |
| tree | f8662808d04e11767b55b396a28f64fb854a867e /merge-recursive.c | |
| parent | treewide: remove cache.h inclusion due to git-zlib changes (diff) | |
| download | git-87bed17907b2cb9a9581a5b8b16b8da264c2a2a8.tar.xz git-87bed17907b2cb9a9581a5b8b16b8da264c2a2a8.zip | |
object-file.h: move declarations for object-file.c functions from cache.h
Signed-off-by: Elijah Newren <newren@gmail.com>
Acked-by: Calvin Wan <calvinwan@google.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 748a6799a3..9875bdb11c 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -22,6 +22,7 @@ #include "hex.h" #include "ll-merge.h" #include "lockfile.h" +#include "object-file.h" #include "object-name.h" #include "object-store.h" #include "repository.h" |