![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
| Sun, 10 Apr 2011 19:34:05 +0000 (19:34 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 12 Apr 2011 07:12:53 +0000 (00:12 -0700) | ||
| commit | f68f1801726eb64d139dfb7d7858a470aef595f2 | |
| tree | 142c850f18a03446457e4ac3e040e3043fe36e31 | tree | snapshot |
| parent | c7f426d4bc38982fe4e64bf3ed4673ddb03c3374 | commit | diff |
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>
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>
| builtin/merge.c | diff | blob | history |