summaryrefslogtreecommitdiff
path: root/t/t6427-diff3-conflict-markers.sh
diff options
context:
space:
mode:
authorLibravatar Jiang Xin <worldhello.net@gmail.com>2021-08-14 17:01:27 +0800
committerLibravatar Jiang Xin <worldhello.net@gmail.com>2021-08-14 17:01:27 +0800
commit9b272daa5012b2bcc6ccffc7ced98f1ead9c9588 (patch)
tree66b45719a21a256c593cea9339bcba3bf46cdfab /t/t6427-diff3-conflict-markers.sh
parentl10n: fr.po v2.33 rnd 2 (diff)
parentl10n: id: po-id for 2.33.0 round 2 (diff)
downloadtgif-9b272daa5012b2bcc6ccffc7ced98f1ead9c9588.tar.xz
Merge branch 'po-id' of github.com:bagasme/git-po
* 'po-id' of github.com:bagasme/git-po: l10n: id: po-id for 2.33.0 round 2
Diffstat (limited to 't/t6427-diff3-conflict-markers.sh')
0 files changed, 0 insertions, 0 deletions