diff options
| author |  Derrick Stolee <dstolee@microsoft.com> | 2021-09-08 11:23:59 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-09-09 15:49:04 -0700 |
| commit | c0b99303db317894dc49398cd3e2db4ef02e8dcf (patch) | |
| tree | ed6b961003a2f542628a116c97274b3d808ef68d /t/chainlint/cuddled-if-then-else.expect | |
| parent | merge-ort: expand only for out-of-cone conflicts (diff) | |
| download | tgif-c0b99303db317894dc49398cd3e2db4ef02e8dcf.tar.xz | |
t1092: add cherry-pick, rebase tests
Add tests to check that cherry-pick and rebase behave the same in the
sparse-index case as in the full index cases. These tests are agnostic
to GIT_TEST_MERGE_ALGORITHM, so a full CI test suite will check both the
'ort' and 'recursive' strategies on this test.
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 't/chainlint/cuddled-if-then-else.expect')
0 files changed, 0 insertions, 0 deletions