aboutsummaryrefslogtreecommitdiffstats
path: root/progs/tests
diff options
context:
space:
mode:
Diffstat (limited to 'progs/tests')
-rw-r--r--progs/tests/auto/conflict_markers.sy2
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)]