Merge branch 'pb/test-scripts-are-build-targets'

[thirdparty/git.git] / merge-ll.h

diff --git a/merge-ll.h b/merge-ll.h
index e4a20e81a3aea90b64e65b1f33a38efa595d9a2a..d038ee0c1e81f71f75a2655be149b481e5afa19f 100644 (file)
--- a/merge-ll.h
+++ b/merge-ll.h
@@ -78,10 +78,15 @@ struct ll_merge_options {
         */
        unsigned extra_marker_size;
 
+       /* Override the global conflict style. */
+       int conflict_style;
+
        /* Extra xpparam_t flags as defined in xdiff/xdiff.h. */
        long xdl_opts;
 };
 
+#define LL_MERGE_OPTIONS_INIT { .conflict_style = -1 }
+
 enum ll_merge_result {
        LL_MERGE_ERROR = -1,
        LL_MERGE_OK = 0,