Mergiraf: Syntax-Aware Merging for Git

3 points | by todsacerdoti 6 hours ago