diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-01-08 16:40:12 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-01-08 16:40:12 +0900 |
| commit | 2db806d817e2a0cfbd1c79cb67a84642f5544939 (patch) | |
| tree | cf870cfc73ebb194410410db37084e2cf97bf68c /t/t4013/diff.format-patch_--inline_--stdout_initial..master^ | |
| parent | 512351f2a84388d223ee6bb763ce5e6c5965f1b8 (diff) | |
| parent | 979ee83e8a908f920d097c10cea5f8857e10898f (diff) | |
| download | git-2db806d817e2a0cfbd1c79cb67a84642f5544939.tar.gz git-2db806d817e2a0cfbd1c79cb67a84642f5544939.zip | |
Merge branch 'en/ort-recursive-d-f-conflict-fix'
The ort merge machinery hit an assertion failure in a history with
criss-cross merges renamed a directory and a non-directory, which
has been corrected.
* en/ort-recursive-d-f-conflict-fix:
merge-ort: fix corner case recursive submodule/directory conflict handling
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..master^')
0 files changed, 0 insertions, 0 deletions