diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-03-20 00:03:48 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-03-20 12:35:40 -0700 |
| commit | 3639dfb3a8ea6935a7863fcbcc1c7a6c9104980e (patch) | |
| tree | 303d140a8b5b7d67da1f4be6e070455cba75f02e /advice.c | |
| parent | merge-ort: let renormalization change modify/delete into clean delete (diff) | |
| download | tgif-3639dfb3a8ea6935a7863fcbcc1c7a6c9104980e.tar.xz | |
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>
Diffstat (limited to 'advice.c')
0 files changed, 0 insertions, 0 deletions