Start the 2.46 cycle

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

diff --git a/merge-recursive.h b/merge-recursive.h
index 3d3b3e3c295deb0dc8470958d01f8ed1e6ef0611..e67d38c30305de9fc34b37dcdcb3f345b1cf97b4 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -31,6 +31,7 @@ struct merge_options {
 
        /* xdiff-related options (patience, ignore whitespace, ours/theirs) */
        long xdl_opts;
+       int conflict_style;
        enum {
                MERGE_VARIANT_NORMAL = 0,
                MERGE_VARIANT_OURS,