diff options
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..167a751 --- /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(3, 7)] |