git: don't keep temporary mergetool files
git: don't keep temporary mergetool files

OmeGak/dotfiles,nop33/dotfiles,nop33/dotfiles,nop33/dotfiles,nop33/dotfiles,OmeGak/dotfiles,OmeGak/dotfiles,OmeGak/dotfiles,OmeGak/dotfiles