progs/tests/auto/conflict_markers.sy


1
2
3
4
5
6
7
8
9
10
11

start :: fn {

<<<<<<< HEAD
print extern_test(4.0)
=======
print extern_test(5.0)
>>>>>>> 2

}

// errors: [ErrorKind::SyntaxError(_, _), ErrorKind::GitConflictError(2, 6)]