diff options
| author | Elijah Newren <newren@gmail.com> | 2018-08-15 17:54:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-15 18:52:09 (GMT) |
| commit | ef3ca95475ce467ae883cc8175ed40e6f7d27800 (patch) | |
| tree | fe44271647b22756c3d53225658287119a3c34cd /merge-recursive.h | |
| parent | 1d89318c48d233d52f1db230cf622935ac3c69fa (diff) | |
| download | git-ef3ca95475ce467ae883cc8175ed40e6f7d27800.zip git-ef3ca95475ce467ae883cc8175ed40e6f7d27800.tar.gz git-ef3ca95475ce467ae883cc8175ed40e6f7d27800.tar.bz2 | |
Add missing includes and forward declarations
I looped over the toplevel header files, creating a temporary two-line C
program for each consisting of
#include "git-compat-util.h"
#include $HEADER
This patch is the result of manually fixing errors in compiling those
tiny programs.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index fa7bc6b..0c46a5a 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -1,8 +1,10 @@ #ifndef MERGE_RECURSIVE_H #define MERGE_RECURSIVE_H -#include "unpack-trees.h" #include "string-list.h" +#include "unpack-trees.h" + +struct commit; struct merge_options { const char *ancestor; |