diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-02-17 17:21:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-17 17:21:42 -0800 |
| commit | fdf3a27ca9f44d0c5597b2d1a018b02f09ba8602 (patch) | |
| tree | 70dd59574abf2bc0c9f9cd7f0e37cf25f936324b /git-merge-octopus.sh | |
| parent | Merge branch 'js/fsck-name-objects-fix' (diff) | |
| parent | t5411: refactor check of refs using test_cmp_refs (diff) | |
| download | tgif-fdf3a27ca9f44d0c5597b2d1a018b02f09ba8602.tar.xz | |
Merge branch 'jx/t5411-unique-filenames'
Avoid individual tests in t5411 from getting affected by each other
by forcing them to use separate output files during the test.
* jx/t5411-unique-filenames:
t5411: refactor check of refs using test_cmp_refs
t5411: use different out file to prevent overwriting
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions