]> git.eshelyaron.com Git - emacs.git/commit
* lisp/vc/smerge-mode.el (smerge-start-session): Don't re-enable
authorStefan Monnier <monnier@iro.umontreal.ca>
Wed, 18 Mar 2020 14:20:13 +0000 (10:20 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Wed, 18 Mar 2020 14:20:13 +0000 (10:20 -0400)
commit299744e083342e43deece03bc0691feb190ccc54
tree304ace8a64e8587c1f5eb4838e3ce9c320d928b2
parentf189e5dc1020db9b41e77488d6290d6e7f032b13
* lisp/vc/smerge-mode.el (smerge-start-session): Don't re-enable

Don't do anything if smerge-mode is already enabled.
lisp/vc/smerge-mode.el