diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-04-10 19:34:05 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-04-12 00:12:53 -0700 |
| commit | f68f1801726eb64d139dfb7d7858a470aef595f2 (patch) | |
| tree | 142c850f18a03446457e4ac3e040e3043fe36e31 /git-mergetool--lib.sh | |
| parent | i18n: mark merge "upstream" messages for translation (diff) | |
| download | tgif-f68f1801726eb64d139dfb7d7858a470aef595f2.tar.xz | |
i18n: mark merge CHERRY_PICK_HEAD messages for translation
Mark CHERRY_PICK_HEAD related messages in builtin/merge.c that were
added in v1.7.5-rc0~88^2~2 (Introduce CHERRY_PICK_HEAD) by Jay Soffian
for translation.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions