diff options
| author | Gustav Sörnäs <gustav@sornas.net> | 2021-03-05 19:46:11 +0100 |
|---|---|---|
| committer | Gustav Sörnäs <gustav@sornas.net> | 2021-03-05 19:46:11 +0100 |
| commit | 0b15a38e324c3940318df462812c42f74a544267 (patch) | |
| tree | c74e44c63c8632cefab7eedcfc721774fc3037a4 /progs/tests | |
| parent | 84d350d3793355da8a7caa4df57d08e38e1f532f (diff) | |
| download | sylt-0b15a38e324c3940318df462812c42f74a544267.tar.gz | |
correct conflict marker test
Diffstat (limited to 'progs/tests')
| -rw-r--r-- | progs/tests/auto/conflict_markers.sy | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/progs/tests/auto/conflict_markers.sy b/progs/tests/auto/conflict_markers.sy index 715a859..167a751 100644 --- a/progs/tests/auto/conflict_markers.sy +++ b/progs/tests/auto/conflict_markers.sy @@ -8,4 +8,4 @@ print extern_test(5.0) } -// errors: [ErrorKind::SyntaxError(_, _), ErrorKind::GitConflictError(2, 6)] +// errors: [ErrorKind::SyntaxError(_, _), ErrorKind::GitConflictError(3, 7)] |