diff options
| author | Derrick Stolee <dstolee@microsoft.com> | 2021-09-08 11:24:01 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-09 15:49:05 -0700 |
| commit | 516680ba7704c473bb21628aa19cabbd787df4db (patch) | |
| tree | d934e2d0337a272150524ae6b30e4bc6c27b72dc /git-svn.perl | |
| parent | 5d9c9349bd0acda149f37eb1c5edc2a5ef747eea (diff) | |
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>
Diffstat (limited to 'git-svn.perl')
0 files changed, 0 insertions, 0 deletions