Mergiraf - syntax-aware git merge driver
Comments ⌘ Read more