dot/emacs: Don't automatically stage files after resolving conflicts.
[profile] / .gitattributes
1 *.el diff=lisp
2 dot/emacs diff=lisp