mergiraf 0.19.0

A syntax-aware merge driver for Git
Documentation
1
2
def myfunc(foo, bar, right)
end