From: Johannes Schindelin Date: Fri, 21 Oct 2016 12:24:50 +0000 (+0200) Subject: sequencer: avoid completely different messages for different actions X-Git-Tag: v2.11.0-rc0~17^2~17 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e635d5ceb7bb4e51d2121b74262ea8fffd5cda4e;p=git-core%2Fgit.git sequencer: avoid completely different messages for different actions Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- diff --git a/sequencer.c b/sequencer.c index 04fcfd893..120a8ee35 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."));