summaryrefslogtreecommitdiff
path: root/t/t3310-notes-merge-manual-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Jiang Xin <worldhello.net@gmail.com>2020-05-28 10:45:33 +0800
committerLibravatar Jiang Xin <worldhello.net@gmail.com>2020-05-28 10:45:33 +0800
commit2c0f79caf0170b58f941f52d9e771acd33861d8a (patch)
treece0accfacc637bd145298504c9dda45b36af625a /t/t3310-notes-merge-manual-resolve.sh
parentMerge branch 'master' of github.com:alshopov/git-po (diff)
parentl10n: tr: v2.27.0 round 2 (diff)
downloadtgif-2c0f79caf0170b58f941f52d9e771acd33861d8a.tar.xz
Merge branch 'master' of github.com:bitigchi/git-po
* 'master' of github.com:bitigchi/git-po: l10n: tr: v2.27.0 round 2
Diffstat (limited to 't/t3310-notes-merge-manual-resolve.sh')
0 files changed, 0 insertions, 0 deletions