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 /notes-merge.c | |
| parent | Merge branch 'vd/adjust-mfow-doc-to-updated-headers' (diff) | |
| parent | git-compat-util: move alloc macros to git-compat-util.h (diff) | |
| download | git-ce481ac8b31c9061eeecd1ba0d7174b621f96632.tar.gz git-ce481ac8b31c9061eeecd1ba0d7174b621f96632.zip | |
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 'notes-merge.c')
| -rw-r--r-- | notes-merge.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/notes-merge.c b/notes-merge.c index 071947894e..8799b522a5 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -20,7 +20,6 @@ #include "trace.h" #include "notes-utils.h" #include "commit-reach.h" -#include "wrapper.h" struct notes_merge_pair { struct object_id obj, base, local, remote; |