el/dot-emacs.el: Turn on `smerge-mode' if we see conflict markers.
[profile] / bg / hypatia.jpg
2009-07-27 Mark Woodingbg/hypatia.jpg: New background.