diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-07-17 11:30:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-07-17 11:30:42 -0700 |
| commit | ce481ac8b31c9061eeecd1ba0d7174b621f96632 (patch) | |
| tree | 21d54bf0d30f970db5c98a2298a0ae6a45057ec6 /builtin/merge.c | |
| parent | d5bb430ec68303cc8fd8a899ba35d6a8bc857df7 (diff) | |
| parent | 91c080dff511b7a81f91d1cc79589b49e16a2b7a (diff) | |
Merge branch 'cw/compat-util-header-cleanup'
Further shuffling of declarations across header files to streamline
file dependencies.
* cw/compat-util-header-cleanup:
git-compat-util: move alloc macros to git-compat-util.h
treewide: remove unnecessary includes for wrapper.h
kwset: move translation table from ctype
sane-ctype.h: create header for sane-ctype macros
git-compat-util: move wrapper.c funcs to its header
git-compat-util: move strbuf.c funcs to its header
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 06cf6afdcb..de68910177 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -10,7 +10,6 @@ #include "builtin.h" #include "abspath.h" #include "advice.h" -#include "alloc.h" #include "config.h" #include "editor.h" #include "environment.h" @@ -53,7 +52,6 @@ #include "commit-reach.h" #include "wt-status.h" #include "commit-graph.h" -#include "wrapper.h" #define DEFAULT_TWOHEAD (1<<0) #define DEFAULT_OCTOPUS (1<<1) |