add conflict marker test

2 files changed, 12 insertions, 10 deletions

diff --git a/progs/tests/simple.sy b/progs/tests/simple.sy
index a82471b..48394d7 100644
--- a/progs/tests/simple.sy
+++ b/progs/tests/simple.sy
@@ -1,10 +1,2 @@
-<<<<<<< HEAD
-print extern_test(4.0)
-<<<<<<< HEAD
-print extern_test(4.0)
-=======
-print extern_test(5.0)
->>>>>>> 2
-=======
-print extern_test(5.0)
->>>>>>> 2
+print test(3.0)
+print test(3.0, 4.0)
diff --git a/src/lib.rs b/src/lib.rs
index 91938f1..858c88f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1367,4 +1367,14 @@ q <=> 3
 
     );
 
+    test_string!(conflict_markers, "
+<<<<<<< HEAD
+print extern_test(4.0)
+=======
+print extern_test(5.0)
+>>>>>>> 2
+",
+                 [ErrorKind::SyntaxError(_, _), ErrorKind::GitConflictError(2, 6)]
+    );
+
 }