el/dot-emacs.el: Turn on `smerge-mode' if we see conflict markers.
[profile] / bin / emacsclient-hack
2009-12-10 Mark WoodingMerge commit 'ponder'
2009-12-09 Mark WoodingMerge commit 'ponder'
2009-12-07 Mark Woodingbin/emacsclient-hack: Open the window on the right...