int rerere(int flags) { struct string_list merge_rr = STRING_LIST_INIT_DUP; int fd; fd = setup_rerere(&merge_rr, flags); if (fd < 0) return 0; return do_plain_rerere(&merge_rr, fd); }
int rerere(void) { struct string_list merge_rr = { NULL, 0, 0, 1 }; int fd; fd = setup_rerere(&merge_rr); if (fd < 0) return 0; return do_plain_rerere(&merge_rr, fd); }
/* * The main entry point that is called internally from codepaths that * perform mergy operations, possibly leaving conflicted index entries * and working tree files. */ int rerere(int flags) { struct string_list merge_rr = STRING_LIST_INIT_DUP; int fd, status; fd = setup_rerere(&merge_rr, flags); if (fd < 0) return 0; status = do_plain_rerere(&merge_rr, fd); free_rerere_dirs(); return status; }