
Sublime Git is a clean code editor for merge conflicts - bedros
https://thenextweb.com/dd/2018/09/21/sublime-git-is-a-clean-code-editor-for-merge-conflicts/
======
mockindignant
The product is called Sublime Merge.

