el/dot-emacs.el: Turn on `smerge-mode' if we see conflict markers.
[profile] / bg / noodly.jpg
2009-07-23 Mark Woodingbg/noodly.jpg: Another glorious background image.