summaryrefslogtreecommitdiff
path: root/diff-no-index.c
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2011-02-22 23:42:02 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-09 23:52:55 -0800
commit157efde10f34344f0970ca71f33dd5ae1c29b6f5 (patch)
tree31183c3bfe2b90c894ad265a8aadd06e0dc875cc /diff-no-index.c
parenti18n: git-merge "You have not concluded your merge" messages (diff)
downloadtgif-157efde10f34344f0970ca71f33dd5ae1c29b6f5.tar.xz
i18n: git-merge "Wonderful" message
Gettextize the "Wonderful" message. A test in t7600-merge.sh explicitly checked for this message. Change it 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 'diff-no-index.c')
0 files changed, 0 insertions, 0 deletions