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 /combine-diff.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 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c index 11e9d7494a..f90f442482 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -17,7 +17,6 @@ #include "userdiff.h" #include "oid-array.h" #include "revision.h" -#include "wrapper.h" static int compare_paths(const struct combine_diff_path *one, const struct diff_filespec *two) |