dot/emacs: Don't automatically stage files after resolving conflicts.
[profile] / dot / zshenv
2017-08-09 Mark Woodingdot/zshenv, setup: Arrange to run the profile code...