diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-09 14:20:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-09 14:20:58 -0800 |
| commit | 87bfbd52e21b6e9373cd70fc148f09dcdad39f09 (patch) | |
| tree | 8c2c72ce24dafbb91c6140536851e2570a535698 /commit.c | |
| parent | Merge branch 'js/test-unset-trace2-parents' (diff) | |
| parent | merge-ort: avoid assuming all renames detected (diff) | |
| download | git-87bfbd52e21b6e9373cd70fc148f09dcdad39f09.tar.gz git-87bfbd52e21b6e9373cd70fc148f09dcdad39f09.zip | |
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
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions