diff options
| author | Elijah Newren <newren@gmail.com> | 2023-03-21 07:26:01 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-21 18:56:53 +0100 |
| commit | d5ebb50dcb2bae27cf9f233088f7258f21e72be7 (patch) | |
| tree | 1f04394298be93ff92b2b28de32420b20f6b816a /merge-recursive.c | |
| parent | path.h: move function declarations for path.c functions from cache.h (diff) | |
| download | git-d5ebb50dcb2bae27cf9f233088f7258f21e72be7.tar.xz git-d5ebb50dcb2bae27cf9f233088f7258f21e72be7.zip | |
wrapper.h: move declarations for wrapper.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 '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 0b0255ebc8..f918cea4c6 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -30,6 +30,7 @@ #include "tag.h" #include "tree-walk.h" #include "unpack-trees.h" +#include "wrapper.h" #include "xdiff-interface.h" struct merge_options_internal { |