diff options
| author | Elijah Newren <newren@gmail.com> | 2018-08-15 10:54:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-15 11:52:09 -0700 |
| commit | ef3ca95475ce467ae883cc8175ed40e6f7d27800 (patch) | |
| tree | fe44271647b22756c3d53225658287119a3c34cd /ll-merge.h | |
| parent | 1d89318c48d233d52f1db230cf622935ac3c69fa (diff) | |
| download | git-ef3ca95475ce467ae883cc8175ed40e6f7d27800.tar.gz | |
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 'll-merge.h')
| -rw-r--r-- | ll-merge.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ll-merge.h b/ll-merge.h index 244a31f55a..b72b19921e 100644 --- a/ll-merge.h +++ b/ll-merge.h @@ -5,6 +5,8 @@ #ifndef LL_MERGE_H #define LL_MERGE_H +#include "xdiff/xdiff.h" + struct ll_merge_options { unsigned virtual_ancestor : 1; unsigned variant : 2; /* favor ours, favor theirs, or union merge */ |