diff options
| author | Gustav Sörnäs <gustav@sornas.net> | 2021-02-22 18:11:50 +0100 |
|---|---|---|
| committer | Gustav Sörnäs <gustav@sornas.net> | 2021-02-22 18:11:50 +0100 |
| commit | 0d1d548032420c0e7daccfe14bc2fed18775d797 (patch) | |
| tree | 418f42b2f9e7242796211fb11f34e68649b585d6 /progs | |
| parent | 12b2c5a161a2922ec86ef003e626ffb78b8f60ed (diff) | |
| download | sylt-0d1d548032420c0e7daccfe14bc2fed18775d797.tar.gz | |
tokenize and report git conflict markers
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/tests/simple.sy | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/progs/tests/simple.sy b/progs/tests/simple.sy index 48394d7..a82471b 100644 --- a/progs/tests/simple.sy +++ b/progs/tests/simple.sy @@ -1,2 +1,10 @@ -print test(3.0) -print test(3.0, 4.0) +<<<<<<< HEAD +print extern_test(4.0) +<<<<<<< HEAD +print extern_test(4.0) +======= +print extern_test(5.0) +>>>>>>> 2 +======= +print extern_test(5.0) +>>>>>>> 2 |