mergiraf 0.19.0

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