| commit | d4a4f9291d63b48b368f79bce3151bee9ca28009 | [log] [tgz] |
|---|---|---|
| author | Elijah Newren <newren@gmail.com> | Sat Apr 22 20:17:26 2023 +0000 |
| committer | Junio C Hamano <gitster@pobox.com> | Mon Apr 24 12:47:33 2023 -0700 |
| tree | 1a19e9b334b90f1f018b7930fcfd0a2499e50c9f | |
| parent | e1c382141d8072b8c8c07c0bd8265b2b3d01ae2b [diff] [blame] |
commit.h: reduce unnecessary includes Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/merge.c b/merge.c index da7fa65..10aaec3 100644 --- a/merge.c +++ b/merge.c
@@ -7,6 +7,7 @@ #include "commit.h" #include "run-command.h" #include "resolve-undo.h" +#include "tree.h" #include "tree-walk.h" #include "unpack-trees.h" #include "dir.h"