diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-10-17 13:27:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-17 13:27:38 -0700 |
| commit | 23415c26fef155f2fa9aebf8a48a6ae457b68c7b (patch) | |
| tree | be7def46123d7aeddc5909e2d2a05c2e263d3744 /builtin/merge.c | |
| parent | Start preparing for 2.10.2 (diff) | |
| parent | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru (diff) | |
| download | tgif-23415c26fef155f2fa9aebf8a48a6ae457b68c7b.tar.xz | |
Merge tag 'l10n-2.10.0-rnd2.4' of git://github.com/git-l10n/git-po into maint
l10n-2.10.0-rnd2.4
* tag 'l10n-2.10.0-rnd2.4' of git://github.com/git-l10n/git-po:
l10n: de.po: translate 260 new messages
l10n: de.po: fix translation of autostash
l10n: ru.po: update Russian translation
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions