mergiraf 0.16.3

A syntax-aware merge driver for Git
Documentation
1
* conflict-marker-size=15