Message ID | 5c8863b9d349f1ea43ae397715ca39d263ee816d.1586573068.git.gitgitgadget@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | rebase -i: mark commits that begin empty in todo editor | expand |
diff --git a/builtin/rebase.c b/builtin/rebase.c index 022aa2589a5..0e223a96d46 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -561,7 +561,7 @@ static void imply_merge(struct rebase_options *opts, const char *option) { switch (opts->type) { case REBASE_APPLY: - die(_("%s requires an interactive rebase"), option); + die(_("%s requires the merge backend"), option); break; case REBASE_MERGE: case REBASE_PRESERVE_MERGES: