Merge branch 'ks/no-textconv-symlink'

[git.git] / ll-merge.h

diff --git a/ll-merge.h b/ll-merge.h
index 4b707f06c00009871a2c6a840f6b3cc9d117143a..244a31f55ac7375b59d7c257bfc2391957fdca94 100644 (file)
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -9,6 +9,7 @@ struct ll_merge_options {
        unsigned virtual_ancestor : 1;
        unsigned variant : 2;   /* favor ours, favor theirs, or union merge */
        unsigned renormalize : 1;
+       long xdl_opts;
 };
 
 int ll_merge(mmbuffer_t *result_buf,