diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-25 17:02:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-25 17:02:58 (GMT) |
| commit | 98b57f977456ca2b991353b27181945d54ef9da2 (patch) | |
| tree | 9e5e8b153980aa8dcddd88d98b778746bebec801 /builtin/merge-ours.c | |
| parent | 2a4a26b53d5ad18ded5d79b0cf0b617ebbb758b4 (diff) | |
| parent | c527acebc2071975dffbccf33f4a1c8adfc6f45f (diff) | |
| download | git-98b57f977456ca2b991353b27181945d54ef9da2.zip git-98b57f977456ca2b991353b27181945d54ef9da2.tar.gz git-98b57f977456ca2b991353b27181945d54ef9da2.tar.bz2 | |
Merge git://github.com/git-l10n/git-po
* git://github.com/git-l10n/git-po:
l10n: vi.po: Updated 5 new messages (2009t0f0u)
l10n: Update Swedish translation (2009t0f0u)
l10n: Update Swedish translation (2004t0f0u)
l10n: zh_CN.po: translate 5 new messages
l10n: git.pot: v1.8.2 round 3 (5 new)
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions