From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 23 Apr 2024 18:52:41 +0000 (-0700)
Subject: Merge branch 'mr/rerere-crash-fix'
X-Git-Tag: v2.45.0-rc1~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b66f5dd8bb553905eaa162d93f000026b241079;p=thirdparty%2Fgit.git

Merge branch 'mr/rerere-crash-fix'

When .git/rr-cache/ rerere database gets corrupted or rerere is fed to
work on a file with conflicted hunks resolved incompletely, the rerere
machinery got confused and segfaulted, which has been corrected.

* mr/rerere-crash-fix:
  rerere: fix crashes due to unmatched opening conflict markers
---

7b66f5dd8bb553905eaa162d93f000026b241079