From: Johannes Schindelin Date: Fri, 21 Oct 2016 12:24:50 GMT Subject: [PATCH v5 10/27] sequencer: avoid completely different messages for different actions Message-ID: <72139cb119aaf28454b141572f5cb46843f5f3e9.1477052405.git.johannes.schindelin@gmx.de> In-Reply-To: Signed-off-by: Johannes Schindelin --- sequencer.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sequencer.c b/sequencer.c index 04fcfd8..120a8ee 100644 --- a/sequencer.c +++ b/sequencer.c @@ -229,11 +229,8 @@ static int error_dirty_index(struct replay_opts *opts) if (read_cache_unmerged()) return error_resolve_conflict(action_name(opts)); - /* Different translation strings for cherry-pick and revert */ - if (opts->action == REPLAY_PICK) - error(_("Your local changes would be overwritten by cherry-pick.")); - else - error(_("Your local changes would be overwritten by revert.")); + error(_("Your local changes would be overwritten by %s."), + action_name(opts)); if (advice_commit_before_merge) advise(_("Commit your changes or stash them to proceed.")); -- 2.10.1.583.g721a9e0