git-merge-recursive: honor merge.conflictstyle once again

diff --git a/revision.h b/revision.h
index 91f194478bb91d381ab2b2440215144d8bb8d18d..2fdb2dd0ff3425b68b47aa8fd11155aa881d4a4a 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -42,6 +42,7 @@ struct rev_info {
                        simplify_history:1,
                        lifo:1,
                        topo_order:1,
+                       simplify_merges:1,
                        tag_objects:1,
                        tree_objects:1,
                        blob_objects:1,
@@ -53,6 +54,7 @@ struct rev_info {
                        rewrite_parents:1,
                        print_parents:1,
                        reverse:1,
+                       reverse_output_stage:1,
                        cherry_pick:1,
                        first_parent_only:1;
 
@@ -110,6 +112,7 @@ struct rev_info {
 
        struct reflog_walk_info *reflog_info;
        struct decoration children;
+       struct decoration merge_simplification;
 };
 
 #define REV_TREE_SAME          0