Marcel Röthke <marcel@xxxxxxxxxxxx> writes: > +test_expect_success 'rerere does not crash with unmatched conflict marker' ' > + git config rerere.enabled true && > ... > + git rebase --continue > +' > + This one fails, either standalone or when merged to 'seen'. A sample CI run that failed can be seen here (you probably need to be logged in to view it): https://github.com/git/git/actions/runs/8694652245/job/23844028985#step:5:1894
