From 64d98f8ee037282c35007b64c2649055c56af1db Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:19:03 +0200
Subject: Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 tests/ui/parser/diff-markers/item-with-attr.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 tests/ui/parser/diff-markers/item-with-attr.rs

(limited to 'tests/ui/parser/diff-markers/item-with-attr.rs')

diff --git a/tests/ui/parser/diff-markers/item-with-attr.rs b/tests/ui/parser/diff-markers/item-with-attr.rs
new file mode 100644
index 000000000..985907c08
--- /dev/null
+++ b/tests/ui/parser/diff-markers/item-with-attr.rs
@@ -0,0 +1,10 @@
+#[attribute]
+<<<<<<< HEAD //~ ERROR encountered diff marker
+fn foo() {}
+=======
+fn bar() {}
+>>>>>>> branch
+
+fn main() {
+    foo();
+}
-- 
cgit v1.2.3