summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-01-12 13:28:13 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-01-12 13:28:13 -0800
commitb4615e40a8125477e18490d868f7b65954372b43 (patch)
treebc55f8abf8451ad2e427d281b9d7663df6557ed9 /Documentation/git-mergetool.txt
parentRevert "Merge branch 'ra/rebase-i-more-options'" (diff)
parentl10n: zh_CN: for git v2.25.0 l10n round 1 (diff)
downloadtgif-b4615e40a8125477e18490d868f7b65954372b43.tar.xz
Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po
l10n-2.25.0-rnd1 * tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po: l10n: zh_CN: for git v2.25.0 l10n round 1 l10n: Update Catalan translation l10n: de.po: Update German translation v2.25.0 round 1 l10n: de.po: Reword generation numbers l10n: bg.po: Updated Bulgarian translation (4800t) l10n: es: 2.25.0 round #1 l10n: sv.po: Update Swedish translation (4800t0f0u) l10n: fr.po v2.25.0 rnd 1 l10n: vi(4800t): Updated Vietnamese translation v2.25.0 l10n: zh_TW.po: update translation for v2.25.0 round 1 l10n: it.po: update the Italian translation for Git 2.25.0 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed) l10n: Update Catalan translation l10n: zh_TW: add translation for v2.24.0
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions