Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
i18n: fix typos for translation
author
Jean-Noel Avila
<jn.avila@free.fr>
Sun, 21 Aug 2016 14:50:37 +0000
(16:50 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 24 Aug 2016 15:41:22 +0000
(08:41 -0700)
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
2632c89
)
diff --git
a/sequencer.c
b/sequencer.c
index 2e9c7d0f03734c20f1fb9d5c6214a7960d80b112..3804fa931d819f035ad6b3159cb8efa1745693d0 100644
(file)
--- a/
sequencer.c
+++ b/
sequencer.c
@@
-702,7
+702,7
@@
static struct commit *parse_insn_line(char *bol, char *eol, struct replay_opts *
if (action != opts->action) {
if (action == REPLAY_REVERT)
error((opts->action == REPLAY_REVERT)
- ? _("Cannot revert during a
a
nother revert.")
+ ? _("Cannot revert during another revert.")
: _("Cannot revert during a cherry-pick."));
else
error((opts->action == REPLAY_REVERT)