summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
Diffstat (limited to 'll-merge.h')
-rw-r--r--ll-merge.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/ll-merge.h b/ll-merge.h
index 244a31f..b72b199 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 */