Stuart Cook 55277add61 Rollup merge of #150443 - estebank:long-diff-markers, r=jackh726 ... Support long diff conflict markers git can be configured to use more than 7 characters for conflict markers, and jj automatically uses longer conflict markers when the text contains any char sequence that could be confused with conflict markers. Ensure that we only point at markers that are consistent with the start marker's length. Ensure that we only consider char sequences at the beginning of a line as a diff marker. Fix https://github.com/rust-lang/rust/issues/150352.		2026-02-08 16:58:23 +11:00
..
src	Rollup merge of #150443 - estebank:long-diff-markers, r=jackh726	2026-02-08 16:58:23 +11:00
Cargo.toml	Convert to inline diagnostics in rustc_parse	2026-02-07 10:30:40 +01:00