summaryrefslogtreecommitdiff
path: root/lisp/vc/smerge-mode.el
diff options
context:
space:
mode:
authorJuri Linkov <juri@linkov.net>2020-01-21 01:09:04 +0200
committerJuri Linkov <juri@linkov.net>2020-01-21 01:09:04 +0200
commitf2f9f2f98ef34bc9c6eef6a7b85b75e4581daabc (patch)
treee7de35e950768c581ee9fffee8c469f8e14a0b8d /lisp/vc/smerge-mode.el
parent3ba0db41e3fcfdc47368e9e6fd7cbe45230ba88b (diff)
downloademacs-f2f9f2f98ef34bc9c6eef6a7b85b75e4581daabc.tar.gz
emacs-f2f9f2f98ef34bc9c6eef6a7b85b75e4581daabc.tar.bz2
emacs-f2f9f2f98ef34bc9c6eef6a7b85b75e4581daabc.zip
* lisp/menu-bar.el: Remove desktop-save-mode from release branch (bug#37594)
; Not to be merged to master
Diffstat (limited to 'lisp/vc/smerge-mode.el')
0 files changed, 0 insertions, 0 deletions