el/dot-emacs.el: Turn on `smerge-mode' if we see conflict markers.
[profile] / el / mdw-gnus-patch.el
2009-07-18 Mark WoodingGreat reorganization.