diff options
| author | Gustav Sörnäs <gustav@sornas.net> | 2021-03-07 17:47:31 +0100 |
|---|---|---|
| committer | Gustav Sörnäs <gustav@sornas.net> | 2021-03-07 23:17:37 +0100 |
| commit | 50d6472d56091d0fece3fb87837a3931215603e4 (patch) | |
| tree | 99459427dab6085a41b687fb0919d442215a8a31 /progs/tests/conflict_markers.sy | |
| parent | 3974ce7c4f0623cef3fcf0abf95d8be6a54d3b44 (diff) | |
| download | sylt-50d6472d56091d0fece3fb87837a3931215603e4.tar.gz | |
move the tests
Diffstat (limited to 'progs/tests/conflict_markers.sy')
| -rw-r--r-- | progs/tests/conflict_markers.sy | 11 |
1 files changed, 11 insertions, 0 deletions
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)] |