Make GVimDiff a default merge tool for Git

* Git configuration
* New Vim shortcuts in merge mode