Set vimdiff as git difftool
Config git pull --rebase to preserve merges