mergiraf 0.19.0

A syntax-aware merge driver for Git
Documentation
1
2
left: changed codeblock language from yaml to yml
right: renamed foo to foo2