1 files changed, 0 insertions, 16 deletions
diff --git a/src/test/ui/parser/diff-markers/fn-arg.rs b/src/test/ui/parser/diff-markers/fn-arg.rs
deleted file mode 100644
index 86c355628ab..00000000000
--- a/src/test/ui/parser/diff-markers/fn-arg.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-trait T {
-    fn foo(
-<<<<<<< HEAD //~ ERROR encountered diff marker
-        x: u8,
-=======
-        x: i8,
->>>>>>> branch
-    ) {}
-}
-
-struct S;
-impl T for S {}
-
-fn main() {
-    S::foo(42);
-}