mathiasbynens/dotfiles — pull request #417 by builtbylane (2014-08-16 00:16:15+00:00)
Title: .gitconfig: Open merge conflicts in default editor

`git fix` FTW