Use diff3 conflict resolution style.
Add fugitive meld mergetool.
Add tabbed meld mergetool (tabbedmeld).