diff options
| author | Elijah Newren <newren@gmail.com> | 2023-02-24 01:09:27 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-24 02:25:29 +0100 |
| commit | 41771fa435a44ff8be3f23753bde0309a2a65b03 (patch) | |
| tree | b0e8d11299caa6a01b56bdd5b367ed0b51ad087a /merge-recursive.c | |
| parent | hex.h: move some hex-related declarations from cache.h (diff) | |
| download | git-41771fa435a44ff8be3f23753bde0309a2a65b03.tar.xz git-41771fa435a44ff8be3f23753bde0309a2a65b03.zip | |
cache.h: remove dependence on hex.h; make other files include it explicitly
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 ae469f8cc8..ee144676b7 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -18,6 +18,7 @@ #include "diff.h" #include "diffcore.h" #include "dir.h" +#include "hex.h" #include "ll-merge.h" #include "lockfile.h" #include "object-store.h" |