mergiraf 0.19.0

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

    def first_method(self):
        print('hi')

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