diff options
author | Junio C Hamano <gitster@pobox.com> | 2025-03-26 16:26:10 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2025-03-26 16:26:11 +0900 |
commit | 52241c96c7514b837233336033b8edc20f8ea0e8 (patch) | |
tree | 4793a79217697ef05544108934b3d85a887438df /builtin/commit.c | |
parent | 1a764cdbdcaba4e9b1d4d5d00b51716977178392 (diff) | |
parent | 3adba40858036a5a44f550aaab5287ad135f5f87 (diff) |
Merge branch 'en/merge-process-renames-crash-fix'
The merge-recursive and merge-ort machinery crashed in corner cases
when certain renames are involved.
* en/merge-process-renames-crash-fix:
merge-ort: fix slightly overzealous assertion for rename-to-self
t6423: add a testcase causing a failed assertion in process_renames
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions