4 ms·Ediff and smerge are both fun to use in Emacs.by ashton314 1y agoEdiff and smerge are both fun to use in Emacs.