diff options
author | Ivan Shmakov <ivan@siamics.net> | 2019-06-25 23:22:19 +0200 |
---|---|---|
committer | Lars Ingebrigtsen <larsi@gnus.org> | 2019-06-25 23:23:01 +0200 |
commit | 394282142563fe1341eba1845672e2412bf8c7d9 (patch) | |
tree | f52ca49d7cd4d28f0e60811bb2b11beb01b581e2 /lisp/emacs-lisp/regexp-opt.el | |
parent | 4217398de3883cc8bc550f6ba33389e8ec85ad6e (diff) | |
download | emacs-394282142563fe1341eba1845672e2412bf8c7d9.tar.gz emacs-394282142563fe1341eba1845672e2412bf8c7d9.tar.bz2 emacs-394282142563fe1341eba1845672e2412bf8c7d9.zip |
Check labels in smerge-mode
* lisp/vc/diff.el (diff-check-labels): Separated out into its own
function (bug#18850)...
(diff-no-select): ... from here.
* lisp/vc/smerge-mode.el (smerge-diff): Use diff-check-labels.
Diffstat (limited to 'lisp/emacs-lisp/regexp-opt.el')
0 files changed, 0 insertions, 0 deletions