Hacker News new | ask | show | jobs
by ashton314 244 days ago
Ediff and smerge are both fun to use in Emacs.