mergiraf 0.19.0

A syntax-aware merge driver for Git
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
<<<<<<< LEFT
from ..._utils import (
    foo,
    bar,
    async_foo,
)
||||||| BASE
from ..._utils import (
    foo,
    async_foo,
)
=======
from ..._utils import foo, async_foo
>>>>>>> RIGHT