.gitconfig: Open merge conflicts in default editor

`git fix` FTW