summaryrefslogtreecommitdiff
path: root/t/t3310-notes-merge-manual-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-06-24 15:29:29 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-06-24 15:29:29 -0700
commit7deb48af0f884c4053e4ac2633ad06fa97ac206c (patch)
tree3e4cc229a38391ce2ce1a090fc7d1fab3955f22a /t/t3310-notes-merge-manual-resolve.sh
parentMerge branch 'jk/diff-blob' into maint (diff)
parentt5313: make extended-table test more deterministic (diff)
downloadtgif-7deb48af0f884c4053e4ac2633ad06fa97ac206c.tar.xz
Merge branch 'jk/pack-idx-corruption-safety' into maint
A flaky test has been corrected. * jk/pack-idx-corruption-safety: t5313: make extended-table test more deterministic
Diffstat (limited to 't/t3310-notes-merge-manual-resolve.sh')
0 files changed, 0 insertions, 0 deletions