summaryrefslogtreecommitdiff
path: root/mergetools/araxis
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-06-13 13:47:10 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-06-13 13:47:10 -0700
commitd0870466f688789fba46ead22736035b22961903 (patch)
tree2508fa7a052827624993cd6f90fffadfe324b2a3 /mergetools/araxis
parentMerge branch 'nd/fopen-errors' (diff)
parentt5313: make extended-table test more deterministic (diff)
downloadtgif-d0870466f688789fba46ead22736035b22961903.tar.xz
Merge branch 'jk/pack-idx-corruption-safety'
A flaky test has been corrected. * jk/pack-idx-corruption-safety: t5313: make extended-table test more deterministic
Diffstat (limited to 'mergetools/araxis')
0 files changed, 0 insertions, 0 deletions