3 ms·smerge-mode or use the emerge diff tool settingby fafner 13y agosmerge-mode or use the emerge diff tool setting