smerge-mode or use the emerge diff tool setting