3 ms·Sublime Git is a clean code editor for merge conflicts3 points by bedros 8y agomockindignant 8y agoThe product is called Sublime Merge.