summaryrefslogtreecommitdiff
path: root/builtin/difftool.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-05-09 23:25:26 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-05-09 23:25:26 +0900
commit951ea7656ebb3f30e6c5e941e625a1318ac58298 (patch)
tree8b4737e0ddff338af48ec8d51e8f5dcc78a8eb85 /builtin/difftool.c
parentSync with v2.12.3 (diff)
parentMerge branch 'master' of git://github.com/nafmo/git-l10n-sv (diff)
downloadtgif-951ea7656ebb3f30e6c5e941e625a1318ac58298.tar.xz
Merge tag 'l10n-2.13.0-rnd2.1' of git://github.com/git-l10n/git-po
l10n for Git 2.13.0 round 2.1 * tag 'l10n-2.13.0-rnd2.1' of git://github.com/git-l10n/git-po: l10n: zh_CN: for git v2.13.0 l10n round 2 l10n: sv.po: Update Swedish translation (3195t0f0u) l10n: zh_CN: review for git v2.13.0 l10n round 1 l10n: Update Catalan translation l10n: bg.po: Updated Bulgarian translation (3195t) l10n: fr.po v2.13 rnd 2 l10n: de.po: translate 4 new messages l10n: de.po: update German translation l10n: de.po: lower case after semi-colon l10n: vi.po(3195t): Update translation for v2.13.0 round 2 l10n: git.pot: v2.13.0 round 2 (4 new, 7 removed) l10n: zh_CN: for git v2.13.0 l10n round 1 l10n: fr.po v2.13 round 1 l10n: pt_PT: update Portuguese translation l10n: bg.po: Updated Bulgarian translation (3201t) l10n: vi.po(3198t): Updated Vietnamese translation for v2.13.0-rc0 l10n: sv.po: Update Swedish translation (3199t0f0u) l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed)
Diffstat (limited to 'builtin/difftool.c')
0 files changed, 0 insertions, 0 deletions