Add git mergetool.keepBackup=false
.vimrc: mapleader, highlight Search, nojoinspaces