sequencer: lib'ify do_recursive_merge()

diff --git a/sequencer.c b/sequencer.c
index ec85fe77b48606026640d2dd75db4a6347111b8b..eb700913a19b36feda9b0ccfd348e7765b465a1f 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -303,7 +303,8 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
        if (active_cache_changed &&
            write_locked_index(&the_index, &index_lock, COMMIT_LOCK))
                /* TRANSLATORS: %s will be "revert" or "cherry-pick" */
-               die(_("%s: Unable to write new index file"), action_name(opts));
+               return error(_("%s: Unable to write new index file"),
+                       action_name(opts));
        rollback_lock_file(&index_lock);
 
        if (opts->signoff)