[Mergiraf,](https://mergiraf.org/) is a syntax-aware merge-conflict resolution tool that integrates with Git. It goes along well with Difftastic, which Devenv *does* already support. The linked website should include all relevant information.
Mergiraf, is a syntax-aware merge-conflict resolution tool that integrates with Git.
It goes along well with Difftastic, which Devenv does already support.
The linked website should include all relevant information.