mergiraf 0.19.0

A syntax-aware merge driver for Git
Documentation
1
2
3
4
class Cls:
    x = 1

    z = 3