![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
| Sun, 19 Sep 2010 14:23:01 +0000 (14:23 +0000) | ||
| committer | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
| Sat, 30 Oct 2010 07:10:12 +0000 (07:10 +0000) | ||
| commit | bfdd11a51286fc7ef0b68ade559e399607a12992 | |
| tree | 6412b51a8bdfcc7622111efebd0cea2772becc0b | tree | snapshot |
| parent | e8645a0a2a86ea6388807b366a9a369aef0de852 | commit | diff |
gettextize: 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>
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>
| builtin/commit.c | diff | blob | history | |
| t/t7110-reset-merge.sh | diff | blob | history |