several config updates
[emacs-init.git] / setup / smerge.el
2013-05-06 Stefan Bund cython mode, smerge mode, updates