diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-04-10 19:34:04 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-12 00:12:53 -0700 |
commit | c7f426d4bc38982fe4e64bf3ed4673ddb03c3374 (patch) | |
tree | 008fed6a8d86a99888db99c0dd215d78f51e5430 /decorate.h | |
parent | i18n: mark merge "Could not read from" message for translation (diff) | |
download | tgif-c7f426d4bc38982fe4e64bf3ed4673ddb03c3374.tar.xz |
i18n: mark merge "upstream" messages for translation
Mark the merge messages that were added in v1.7.5-rc1~17^2 (merge:
merge with the default upstream branch without argument) by Junio C
Hamano for translation.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'decorate.h')
0 files changed, 0 insertions, 0 deletions