diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-24 19:39:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-24 19:39:36 -0700 |
| commit | 09dcde9ddd1ffd2e3d0a889d6bbc798db2c6770c (patch) | |
| tree | 4a4ba2ee6547a49967e527ec6cfed64591f30a6c /t/t6037-merge-ours-theirs.sh | |
| parent | Merge branch 'gp/hppa-stack-test-fix' (diff) | |
| parent | t4067: make rename detection test output raw diff (diff) | |
| download | tgif-09dcde9ddd1ffd2e3d0a889d6bbc798db2c6770c.tar.xz | |
Merge branch 'jt/avoid-prefetch-when-able-in-diff'
Test-coverage enhancement.
* jt/avoid-prefetch-when-able-in-diff:
t4067: make rename detection test output raw diff
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions