1 files changed, 15 insertions, 0 deletions
diff --git a/tests/ui/parser/diff-markers/statement.rs b/tests/ui/parser/diff-markers/statement.rs
new file mode 100644
index 000000000..e55d16d3b
--- /dev/null
+++ b/tests/ui/parser/diff-markers/statement.rs
@@ -0,0 +1,15 @@
+trait T {
+    fn foo() {}
+    fn bar() {}
+}
+
+struct S;
+impl T for S {}
+
+fn main() {
+<<<<<<< HEAD //~ ERROR encountered diff marker
+    S::foo();
+=======
+    S::bar();
+>>>>>>> branch
+}