mergiraf 0.19.0

A syntax-aware merge driver for Git
Documentation 
1
2
3
4
5
6
7
8
9
10
11

class Big:
    """
    Wow, such a big class!
    """

    class Inner1:
        foo = 1

    class Inner2:
        def run():
            return 4