]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4217398) | patch
Check labels in smerge-mode
authorIvan Shmakov <ivan@siamics.net>
Tue, 25 Jun 2019 21:22:19 +0000 (23:22 +0200)
committerLars Ingebrigtsen <larsi@gnus.org>
Tue, 25 Jun 2019 21:23:01 +0000 (23:23 +0200)
commit394282142563fe1341eba1845672e2412bf8c7d9
treef52ca49d7cd4d28f0e60811bb2b11beb01b581e2tree | snapshot
parent4217398de3883cc8bc550f6ba33389e8ec85ad6ecommit | diff
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.
lisp/vc/diff.el diff | blob | history
lisp/vc/smerge-mode.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.