static int do_recursive_merge(struct commit *base, struct commit *next,
const char *base_label, const char *next_label,
static int do_recursive_merge(struct commit *base, struct commit *next,
const char *base_label, const char *next_label,
res = -1;
else if (!opts->strategy || !strcmp(opts->strategy, "recursive") || command == TODO_REVERT) {
res = do_recursive_merge(base, next, base_label, next_label,
res = -1;
else if (!opts->strategy || !strcmp(opts->strategy, "recursive") || command == TODO_REVERT) {
res = do_recursive_merge(base, next, base_label, next_label,