diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-10-21 14:24:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-21 09:32:34 -0700 |
| commit | e635d5ceb7bb4e51d2121b74262ea8fffd5cda4e (patch) | |
| tree | e7f08ec933a12c99c9d8f712bcbc5002c8110164 | |
| parent | sequencer: strip CR from the todo script (diff) | |
| download | git-e635d5ceb7bb4e51d2121b74262ea8fffd5cda4e.tar.gz git-e635d5ceb7bb4e51d2121b74262ea8fffd5cda4e.zip | |
sequencer: avoid completely different messages for different actions
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | sequencer.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sequencer.c b/sequencer.c index 04fcfd893f..120a8ee351 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.")); |