Set Git editor to MacVim, hopefully.