diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-10-21 12:24:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-21 16:32:34 (GMT) |
| commit | e635d5ceb7bb4e51d2121b74262ea8fffd5cda4e (patch) | |
| tree | e7f08ec933a12c99c9d8f712bcbc5002c8110164 /sequencer.c | |
| parent | 6307041dd2ca2f3507dc2791a1824d72302b0081 (diff) | |
| download | git-e635d5ceb7bb4e51d2121b74262ea8fffd5cda4e.zip git-e635d5ceb7bb4e51d2121b74262ea8fffd5cda4e.tar.gz git-e635d5ceb7bb4e51d2121b74262ea8fffd5cda4e.tar.bz2 | |
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>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 7 |
1 files 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.")); |