diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2022-08-25 01:15:24 +0300 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2022-08-25 01:16:10 +0300 |
| commit | bc8141594d67fcb95dc58e031d811aee0dbf96e0 (patch) | |
| tree | 5acd71b0e6bc1db094635b5f0dc5d1a25b1e7f59 /lisp/emacs-lisp/timer.el | |
| parent | 78923c5f4e26d3cb9fbaf0dbf2d04c523482e52c (diff) | |
| download | emacs-bc8141594d67fcb95dc58e031d811aee0dbf96e0.tar.gz emacs-bc8141594d67fcb95dc58e031d811aee0dbf96e0.tar.bz2 emacs-bc8141594d67fcb95dc58e031d811aee0dbf96e0.zip | |
vc-merge: Look for 'merge-file' instead of 'merge'
* lisp/vc/vc.el (vc-merge):
Look for 'merge-file' in second clause (bug#50258).
Diffstat (limited to 'lisp/emacs-lisp/timer.el')
0 files changed, 0 insertions, 0 deletions