summaryrefslogtreecommitdiff
path: root/t/t3309-notes-merge-auto-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Jiang Xin <worldhello.net@gmail.com>2020-05-17 09:28:44 +0800
committerLibravatar Jiang Xin <worldhello.net@gmail.com>2020-05-17 09:28:44 +0800
commit722ab588c561032a478c2fdefae7a7cfd1acff51 (patch)
treed1428015089d5bde1e0ebd0013b135f28047ac9c /t/t3309-notes-merge-auto-resolve.sh
parentMerge branch 'git-2.27-round-1' of github.com:bitigchi/git-po (diff)
parentl10n: fr v2.27.0 rnd 1 (diff)
downloadtgif-722ab588c561032a478c2fdefae7a7cfd1acff51.tar.xz
Merge branch 'fr_2.27.0_rnd1' of github.com:jnavila/git
* 'fr_2.27.0_rnd1' of github.com:jnavila/git: l10n: fr v2.27.0 rnd 1
Diffstat (limited to 't/t3309-notes-merge-auto-resolve.sh')
0 files changed, 0 insertions, 0 deletions