Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de>
---
 sequencer.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/sequencer.c b/sequencer.c
index cbdce6d..1b65202 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -232,11 +232,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.0.rc1.114.g2bd6b38


Reply via email to