Hacker News new | ask | show | jobs
by shawn_w 617 days ago
emacs' smerge has always worked well for me.