diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-02-22 23:41:45 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-09 23:52:54 -0800 |
| commit | 9c227655b02c8f84e319a57bb8dd7cff63e3fbf8 (patch) | |
| tree | 24bdb4fa3d3780061bcda184af799a188942a41a /builtin/commit.c | |
| parent | 8a6179bcb6022c433ac87a01393155d64166eb7b (diff) | |
| download | git-9c227655b02c8f84e319a57bb8dd7cff63e3fbf8.tar.gz git-9c227655b02c8f84e319a57bb8dd7cff63e3fbf8.tar.xz | |
i18n: git-commit "middle of a merge" message
Gettextize the "You are in the middle of a merge -- cannot amend."
message. Several tests in t7110-reset-merge.sh explicitly checked for
this message. Change them to skip under GETTEXT_POISON=YesPlease.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 472c2baed..e944c4d77 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -928,9 +928,9 @@ static int parse_and_validate_options(int argc, const char *argv[], if (amend && initial_commit) die(_("You have nothing to amend.")); if (amend && in_merge) - die("You are in the middle of a merge -- cannot amend."); + die(_("You are in the middle of a merge -- cannot amend.")); if (fixup_message && squash_message) - die("Options --squash and --fixup cannot be used together"); + die(_("Options --squash and --fixup cannot be used together")); if (use_message) f++; if (edit_message) |