Derrick Stolee 516680ba77 sparse-index: integrate with cherry-pick and rebase ...

The hard work was already done with 'git merge' and the ORT strategy.
Just add extra tests to see that we get the expected results in the
non-conflict cases.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2021-09-09 15:49:05 -07:00

25 KiB

Executable File

Raw Blame History

View Raw