dot/emacs: Don't automatically stage files after resolving conflicts.
[profile] / dot / parallel-config
1 ### -*-conf-*-
2 --gnu