mergiraf 0.19.0

A syntax-aware merge driver for Git
Documentation
1
2
3
4
5
6
7
8
9
The structured resolution of this merge gives:

```
from ..._utils import foo,
    bar, async_foo
```
which is syntactically invalid but still accepted by the Python grammar.

This test checks that this structured resolution is rejected.