some git mergetool tweaks
.ssh/config