![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
| Sun, 19 Sep 2010 15:20:50 +0000 (15:20 +0000) | ||
| committer | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
| Sat, 30 Oct 2010 07:12:07 +0000 (07:12 +0000) | ||
| commit | 5cd3549c58c1981fa87a04bd955b60bef7247b1e | |
| tree | 92dcb7e7a434896693f02c685529f309774084e9 | tree | snapshot |
| parent | 7a1b1d33c5749522428fcb2aea3ab8c9edc6fdf9 | commit | diff |
gettextize: git-merge "You have not concluded your merge" messages
Gettextize the "You have not concluded your merge messages. A test in
t3030-merge-recursive.sh explicitly checked for this message. Change
it to skip the test under GETTEXT_POISON=YesPlease.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Gettextize the "You have not concluded your merge messages. A test in
t3030-merge-recursive.sh explicitly checked for this message. Change
it to skip the test under GETTEXT_POISON=YesPlease.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
| builtin/merge.c | diff | blob | history | |
| t/t3030-merge-recursive.sh | diff | blob | history |