diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-04-23 11:52:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-04-23 11:52:41 -0700 |
| commit | 7b66f5dd8bb553905eaa162d93f000026b241079 (patch) | |
| tree | 62a481ea6d1d919fe3daed4ceb02ab6abe47b8f7 /commit.h | |
| parent | Merge branch 'rs/imap-send-simplify-cmd-issuing-codepath' (diff) | |
| parent | rerere: fix crashes due to unmatched opening conflict markers (diff) | |
| download | git-7b66f5dd8bb553905eaa162d93f000026b241079.tar.gz git-7b66f5dd8bb553905eaa162d93f000026b241079.zip | |
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
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions