dot/emacs: Don't automatically stage files after resolving conflicts.
[profile] / .gitignore
CommitLineData
67b1a15a 1/local.mk