| commit | 87bfbd52e21b6e9373cd70fc148f09dcdad39f09 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 9 Feb 2022 22:20:58 +0000 (9 14:20 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 9 Feb 2022 22:20:58 +0000 (9 14:20 -0800) | ||
| tree | 8c2c72ce24dafbb91c6140536851e2570a535698 | treesnapshot (tar.gz zip) |
| parent | e1c192d387ef27b3cf297688625d3f49e0068563 | commitdiff |
| parent | 9ae39fef7f3764537e029b57687f6a0a3163e810 | commitdiff |
Merge branch 'en/merge-ort-restart-optim-fix'
The merge-ort misbehaved when merge.renameLimit configuration is
set too low and failed to find all renames.
* en/merge-ort-restart-optim-fix:
merge-ort: avoid assuming all renames detected
The merge-ort misbehaved when merge.renameLimit configuration is
set too low and failed to find all renames.
* en/merge-ort-restart-optim-fix:
merge-ort: avoid assuming all renames detected
| merge-ort.c | diff1 | diff2 | blobhistory |