From 50d6472d56091d0fece3fb87837a3931215603e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gustav@sornas.net>
Date: Sun, 7 Mar 2021 17:47:31 +0100
Subject: move the tests

---
 progs/tests/conflict_markers.sy | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 progs/tests/conflict_markers.sy

(limited to 'progs/tests/conflict_markers.sy')

diff --git a/progs/tests/conflict_markers.sy b/progs/tests/conflict_markers.sy
new file mode 100644
index 0000000..0760582
--- /dev/null
+++ b/progs/tests/conflict_markers.sy
@@ -0,0 +1,11 @@
+start :: fn {
+
+<<<<<<< HEAD
+    print extern_test(4.0)
+=======
+    print extern_test(5.0)
+>>>>>>> 2
+
+}
+
+// errors: [ErrorKind::SyntaxError(_, _), ErrorKind::GitConflictError(3, 7)]
-- 
cgit v1.2.1