3 ms·i find magit even better, but of the non-emacs gits porcelains, smerge is way at the top of the heap.by hprotagonist 7y agoi find magit even better, but of the non-emacs gits porcelains, smerge is way at the top of the heap.