diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-11-07 20:40:30 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-11-08 14:23:54 +0900 |
| commit | b8cd1bb71306e489d73e5cf4ef75a6cdb4c223b7 (patch) | |
| tree | 5e519913cb329c9bd48ab2f2687388c4da478468 /t/t4013/diff.diff_--no-index_--raw_--abbrev=4_dir2_dir | |
| parent | merge-recursive: improve rename/rename(1to2)/add[/add] handling (diff) | |
| download | tgif-b8cd1bb71306e489d73e5cf4ef75a6cdb4c223b7.tar.xz | |
t6036, t6043: increase code coverage for file collision handling
Stolee's coverage reports found a few code blocks for file collision
conflicts that had not previously been covered by testcases; add a few
more testcases to cover those too.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.diff_--no-index_--raw_--abbrev=4_dir2_dir')
0 files changed, 0 insertions, 0 deletions