aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2017-10-19 08:13:29 +0800
committerJiang Xin <worldhello.net@gmail.com>2017-10-19 08:13:29 +0800
commitc271fa460cee47bb2c19637358defac770e92c99 (patch)
treec2d57c894f87d1f2e8f6b269ee795bcaaf4d9ae8 /builtin/merge-recursive.c
parentd9e43e139b91fd857f0c5f083b98303f855ed6f1 (diff)
parent6628a6e688f977b2be66d6c44b75e080b06f2a44 (diff)
downloadgit-c271fa460cee47bb2c19637358defac770e92c99.tar.gz
git-c271fa460cee47bb2c19637358defac770e92c99.tar.xz
Merge branch 'translation' of https://github.com/ChrisADR/git-po
* 'translation' of https://github.com/ChrisADR/git-po: l10n: es.po: v2.15.0 round 2
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions