Make emacs diff and merge work properly inline.