| commit | 3639dfb3a8ea6935a7863fcbcc1c7a6c9104980e | |
| author | Elijah Newren <newren@gmail.com> | |
| Sat, 20 Mar 2021 00:03:48 +0000 (20 00:03 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 20 Mar 2021 19:35:40 +0000 (20 12:35 -0700) | ||
| tree | 303d140a8b5b7d67da1f4be6e070455cba75f02e | treesnapshot (tar.gz zip) |
| parent | 3860220bfa594a56daa801aaedbdf8ac75b62bb6 | commitdiff |
merge-ort: support subtree shifting
merge-recursive has some simple code to support subtree shifting; copy
it over to merge-ort. This fixes t6409.12 under
GIT_TEST_MERGE_ALGORITHM=ort.
Signed-off-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive has some simple code to support subtree shifting; copy
it over to merge-ort. This fixes t6409.12 under
GIT_TEST_MERGE_ALGORITHM=ort.
Signed-off-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-ort.c | diffblobblamehistory |