merge-recursive: rename conflict_rename_*() family of functions

diff --git a/sequencer.h b/sequencer.h
index d9570d92b11d15e6046e4b8473cb5f8a450ea64f..c5787c6b566bbc89caad1a099f4281fecba01766 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -44,10 +44,18 @@ struct replay_opts {
        char **xopts;
        size_t xopts_nr, xopts_alloc;
 
+       /* Used by fixup/squash */
+       struct strbuf current_fixups;
+       int current_fixup_count;
+
+       /* placeholder commit for -i --root */
+       struct object_id squash_onto;
+       int have_squash_onto;
+
        /* Only used by REPLAY_NONE */
        struct rev_info *revs;
 };
-#define REPLAY_OPTS_INIT { -1 }
+#define REPLAY_OPTS_INIT { .action = -1, .current_fixups = STRBUF_INIT }
 
 /* Call this to setup defaults before parsing command line options */
 void sequencer_init_config(struct replay_opts *opts);