summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2020-03-18 10:20:13 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2020-03-18 10:20:13 -0400
commit299744e083342e43deece03bc0691feb190ccc54 (patch)
tree304ace8a64e8587c1f5eb4838e3ce9c320d928b2 /lisp/emacs-lisp
parentf189e5dc1020db9b41e77488d6290d6e7f032b13 (diff)
downloademacs-299744e083342e43deece03bc0691feb190ccc54.tar.gz
emacs-299744e083342e43deece03bc0691feb190ccc54.tar.bz2
emacs-299744e083342e43deece03bc0691feb190ccc54.zip
* lisp/vc/smerge-mode.el (smerge-start-session): Don't re-enable
Don't do anything if smerge-mode is already enabled.
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions