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

diff --git a/revision.h b/revision.h
index fc23522b3850edb3752181596fd83da8599e3d27..2fdb2dd0ff3425b68b47aa8fd11155aa881d4a4a 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -54,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;