From ef3ca95475ce467ae883cc8175ed40e6f7d27800 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Wed, 15 Aug 2018 10:54:05 -0700 Subject: 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 Signed-off-by: Junio C Hamano --- ll-merge.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'll-merge.h') 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 */ -- cgit v1.2.1