Matthias Krüger 73cc4eca56 Rollup merge of #126125 - dev-ardi:conflict-markers, r=estebank ... Improve conflict marker recovery <!-- If this PR is related to an unstable feature or an otherwise tracked effort, please link to the relevant tracking issue here. If you don't know of a related tracking issue or there are none, feel free to ignore this. This PR will get automatically assigned to a reviewer. In case you would like a specific user to review your work, you can assign it to them by using r​? <reviewer name> --> closes #113826 r? ```@estebank``` since you reviewed #115413 cc: ```@rben01``` since you opened up the issue in the first place		2024-06-21 09:12:34 +02:00
..
src	Rollup merge of #126125 - dev-ardi:conflict-markers, r=estebank	2024-06-21 09:12:34 +02:00
Cargo.toml	Move some tests from rustc_expand to rustc_parse.	2024-05-06 09:06:02 +10:00
messages.ftl	Move parse_or_use_outer_attributes out of parse_expr_prefix_range.	2024-06-19 19:12:00 +10:00