diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:35:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:35:08 -0800 |
| commit | b0b5337876c418862f81c69e0b481eecded38728 (patch) | |
| tree | 5984c97f9c9f9c0ee0ce60cfc5a3cd739813303f /builtin/merge-recursive.c | |
| parent | Merge branch 'js/trace2-avoid-recursive-errors' (diff) | |
| parent | t5319: corrupt more bytes of the midx checksum (diff) | |
| download | tgif-b0b5337876c418862f81c69e0b481eecded38728.tar.xz | |
Merge branch 'jk/t5319-midx-corruption-test-deflake'
Test fix.
* jk/t5319-midx-corruption-test-deflake:
t5319: corrupt more bytes of the midx checksum
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions