Commit Graph

3 Commits

Author SHA1 Message Date
ardi
d51b4462ec Improve conflict marker recovery 2024-06-19 00:27:41 +02:00
Nilstrieb
41e8d152dc Show number in error message even for one error
Co-authored-by: Adrian <adrian.iosdev@gmail.com>
2023-11-24 19:15:52 +01: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