mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: git-commit "middle of a merge" message

Browse Source 
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>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2011-02-22 23:41:45 +00:00
committed by Junio C Hamano
parent 8a6179bcb6
commit 9c227655b0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/commit.c
View File

@ -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)