Ediff and smerge are both fun to use in Emacs.