about summary refs log tree commit diff
path: root/src/test/ui/parser/diff-markers/struct-expr.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/ui/parser/diff-markers/struct-expr.rs')
-rw-r--r--src/test/ui/parser/diff-markers/struct-expr.rs12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/test/ui/parser/diff-markers/struct-expr.rs b/src/test/ui/parser/diff-markers/struct-expr.rs
deleted file mode 100644
index 99d2fd662c6..00000000000
--- a/src/test/ui/parser/diff-markers/struct-expr.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-struct S {
-    x: u8,
-}
-fn main() {
-    let _ = S {
-<<<<<<< HEAD //~ ERROR encountered diff marker
-        x: 42,
-=======
-        x: 0,
->>>>>>> branch
-    }
-}