rust/tests/ui/parser/diff-markers
Esteban Küber ebd4bc9224 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.
2026-01-02 22:32:52 +00:00
..
enum-2.rs
enum-2.stderr Tweak wording of diff marker diagnostic 2025-12-25 20:56:03 +00:00
enum.rs
enum.stderr Tweak wording of diff marker diagnostic 2025-12-25 20:56:03 +00:00
fn-arg.rs
fn-arg.stderr Tweak wording of diff marker diagnostic 2025-12-25 20:56:03 +00:00
item-with-attr.rs
item-with-attr.stderr Tweak wording of diff marker diagnostic 2025-12-25 20:56:03 +00:00
item.rs
item.stderr Tweak wording of diff marker diagnostic 2025-12-25 20:56:03 +00:00
long-conflict-markers.rs Support long diff conflict markers 2026-01-02 22:32:52 +00:00
long-conflict-markers.stderr Support long diff conflict markers 2026-01-02 22:32:52 +00:00
statement.rs
statement.stderr Tweak wording of diff marker diagnostic 2025-12-25 20:56:03 +00:00
struct-expr.rs
struct-expr.stderr Tweak wording of diff marker diagnostic 2025-12-25 20:56:03 +00:00
struct.rs
struct.stderr Tweak wording of diff marker diagnostic 2025-12-25 20:56:03 +00:00
trait-item.rs
trait-item.stderr Tweak wording of diff marker diagnostic 2025-12-25 20:56:03 +00:00
tuple-struct.rs
tuple-struct.stderr Tweak wording of diff marker diagnostic 2025-12-25 20:56:03 +00:00
unclosed-delims-in-macro.rs UI tests: add missing diagnostic kinds where possible 2025-04-08 23:06:31 +03:00
unclosed-delims-in-macro.stderr UI tests: add missing diagnostic kinds where possible 2025-04-08 23:06:31 +03:00
unclosed-delims.rs UI tests: add missing diagnostic kinds where possible 2025-04-08 23:06:31 +03:00
unclosed-delims.stderr UI tests: add missing diagnostic kinds where possible 2025-04-08 23:06:31 +03:00
use-statement.rs
use-statement.stderr Tweak wording of diff marker diagnostic 2025-12-25 20:56:03 +00:00