diff options
| author | Gustav Sörnäs <gustav@sornas.net> | 2021-03-05 19:07:13 +0100 |
|---|---|---|
| committer | Gustav Sörnäs <gustav@sornas.net> | 2021-03-05 19:07:13 +0100 |
| commit | 2570830850c6dadadc2c86bf9d6f3203c9aba488 (patch) | |
| tree | f6d00459337da26261c16e39cb4241be6441bfb4 /progs/tests/auto/conflict_markers.sy | |
| parent | 9d0a930d811b825b39ee16614e645b6934130cc1 (diff) | |
| download | sylt-2570830850c6dadadc2c86bf9d6f3203c9aba488.tar.gz | |
convert tests to files
Diffstat (limited to 'progs/tests/auto/conflict_markers.sy')
| -rw-r--r-- | progs/tests/auto/conflict_markers.sy | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/progs/tests/auto/conflict_markers.sy b/progs/tests/auto/conflict_markers.sy new file mode 100644 index 0000000..715a859 --- /dev/null +++ b/progs/tests/auto/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(2, 6)] |