mergiraf 0.19.0

A syntax-aware merge driver for Git
Documentation
1
2
3
4
5
class MyCls:
    attr = 1

    def second_method(self, arg):
        print('there')