t7501: add test of "commit --dry-run --short"

diff --git a/ll-merge.h b/ll-merge.h
index 244a31f55ac7375b59d7c257bfc2391957fdca94..b72b19921e8f33ab23aa5bb6293b9b6841035df9 100644 (file)
--- 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 */