]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: def8c6a d30126c)
Merge branch 'en/merge-ort-renorm-with-rename-delete-conflict-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2022 19:52:55 +0000 (11:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2022 19:52:55 +0000 (11:52 -0800)
A corner case bug in the ort merge strategy has been corrected.

* en/merge-ort-renorm-with-rename-delete-conflict-fix:
  merge-ort: fix bug with renormalization and rename/delete conflicts


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.