diff options
| author | Gustav Sörnäs <gustav@sornas.net> | 2021-02-22 18:37:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 18:37:43 +0100 |
| commit | a9d943e2d93be0e741874cb1ef85488dacc6eeab (patch) | |
| tree | e6591f07da1455d170d5c20c1f49beeeefcd5bbd /src/lib.rs | |
| parent | 02bb836d9a9261b0ba9eb5ef6a9f02cc3605b672 (diff) | |
| parent | 7b2dd8497967bb2a78f7ff2055a4976a9bb2a4e5 (diff) | |
| download | sylt-a9d943e2d93be0e741874cb1ef85488dacc6eeab.tar.gz | |
Merge pull request #87 from FredTheDino/conflict-markers
Detect conflict markers
Diffstat (limited to 'src/lib.rs')
| -rw-r--r-- | src/lib.rs | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -1367,4 +1367,14 @@ q <=> 3 ); + test_string!(conflict_markers, " +<<<<<<< HEAD +print extern_test(4.0) +======= +print extern_test(5.0) +>>>>>>> 2 +", + [ErrorKind::SyntaxError(_, _), ErrorKind::GitConflictError(2, 6)] + ); + } |