summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
diff options
context:
space:
mode:
authorLibravatar Jiang Xin <worldhello.net@gmail.com>2017-10-24 10:11:48 +0800
committerLibravatar Jiang Xin <worldhello.net@gmail.com>2017-10-24 10:11:48 +0800
commit1165e3c317b51a3f47afe1a5762b92cac695fe5c (patch)
treec6e2c2fff003e481408f99709d865c73a06f7af7 /Documentation/git-difftool.txt
parentMerge branch 'master' of https://github.com/ralfth/git-po-de (diff)
parentl10n: zh_CN: review for git v2.15.0 l10n round 2 (diff)
downloadtgif-1165e3c317b51a3f47afe1a5762b92cac695fe5c.tar.xz
Merge branch 'jx/zh_CN-proposed' of github.com:jiangxin/git
* 'jx/zh_CN-proposed' of github.com:jiangxin/git: l10n: zh_CN: review for git v2.15.0 l10n round 2 l10n: zh_CN: for git v2.15.0 l10n round 2
Diffstat (limited to 'Documentation/git-difftool.txt')
0 files changed, 0 insertions, 0 deletions