mergiraf 0.19.0

A syntax-aware merge driver for Git
Documentation
1
2
from foo import bar
from hello import world