dot/emacs: Don't automatically stage files after resolving conflicts.
[profile] / dot / swank.lisp
2009-07-18 Mark WoodingGreat reorganization.