3 ms·emacs' smerge has always worked well for me.by shawn_w 2y agoemacs' smerge has always worked well for me.