diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-08 16:22:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-08 16:22:10 -0800 |
| commit | 0f7a10a3aad344a28f0f30b32a979925a9629533 (patch) | |
| tree | 1cc568818c02a2b9eee943dbb07d9485f93e3801 /builtin/merge.c | |
| parent | 3aea0dad70446222adf0e111aac70285a5735604 (diff) | |
| parent | d57c671a511d885a5cd390e3d6064c37af524a91 (diff) | |
Merge branch 'en/header-cleanup' into maint-2.43
Remove unused header "#include".
* en/header-cleanup:
treewide: remove unnecessary includes in source files
treewide: add direct includes currently only pulled in transitively
trace2/tr2_tls.h: remove unnecessary include
submodule-config.h: remove unnecessary include
pkt-line.h: remove unnecessary include
line-log.h: remove unnecessary include
http.h: remove unnecessary include
fsmonitor--daemon.h: remove unnecessary includes
blame.h: remove unnecessary includes
archive.h: remove unnecessary include
treewide: remove unnecessary includes in source files
treewide: remove unnecessary includes from header files
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index f837483312..ebbe05033e 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -31,8 +31,6 @@ #include "unpack-trees.h" #include "cache-tree.h" #include "dir.h" -#include "utf8.h" -#include "log-tree.h" #include "color.h" #include "rerere.h" #include "help.h" @@ -42,10 +40,8 @@ #include "resolve-undo.h" #include "remote.h" #include "fmt-merge-msg.h" -#include "gpg-interface.h" #include "sequencer.h" #include "string-list.h" -#include "packfile.h" #include "tag.h" #include "alias.h" #include "branch.h" |