Commit Graph

2 Commits

Author SHA1 Message Date
ardi
d51b4462ec Improve conflict marker recovery 2024-06-19 00:27:41 +02:00
Esteban Küber
50ca5ef07f When encountering unclosed delimiters during parsing, check for diff markers
Fix #116252.
2023-10-30 00:56:46 +00:00