chiark / gitweb /
~mdw / profile / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 70b2697) | patch
el/dot-emacs.el: Turn on `smerge-mode' if we see conflict markers.
authorMark Wooding <mdw@distorted.org.uk>
Wed, 20 Sep 2017 15:07:23 +0000 (16:07 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Wed, 20 Sep 2017 15:49:30 +0000 (16:49 +0100)
commit5d824e2fc0f7bb18c222539ce4cb2785c5a66d9e
treeb90ad4e65769954bffc17929b6d79fc0cfb52a4btree | snapshot
parent70b26978c1f459ecaa39ff88d356bebc171e28cccommit | diff
el/dot-emacs.el: Turn on `smerge-mode' if we see conflict markers.

This seems like generally a good thing.
el/dot-emacs.el diff | blob | blame | history
Dotfiles and other configuration.