diff options
| author | Elijah Newren <newren@gmail.com> | 2023-02-24 03:09:27 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-24 04:25:29 +0300 |
| commit | 41771fa435a44ff8be3f23753bde0309a2a65b03 (patch) | |
| tree | b0e8d11299caa6a01b56bdd5b367ed0b51ad087a /builtin/merge-tree.c | |
| parent | b73ecb48114926d063d7ab96943bafcc0ae913b6 (diff) | |
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 'builtin/merge-tree.c')
| -rw-r--r-- | builtin/merge-tree.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index 828dc81c42..e782518164 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -3,6 +3,7 @@ #include "tree-walk.h" #include "xdiff-interface.h" #include "help.h" +#include "hex.h" #include "commit.h" #include "commit-reach.h" #include "merge-ort.h" |