dot/emacs: Don't automatically stage files after resolving conflicts.