projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 650ed9d) | patch
i18n: mark merge "upstream" messages for translation
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Sun, 10 Apr 2011 19:34:04 +0000 (19:34 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Apr 2011 07:12:53 +0000 (00:12 -0700)
commitc7f426d4bc38982fe4e64bf3ed4673ddb03c3374
tree008fed6a8d86a99888db99c0dd215d78f51e5430tree | snapshot
parent650ed9db74188654656afcd38b1d7672161cb90bcommit | diff
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>
builtin/merge.c diff | blob | history
Git—the stupid content tracker