]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 78923c5) | patch
vc-merge: Look for 'merge-file' instead of 'merge'
authorDmitry Gutov <dgutov@yandex.ru>
Wed, 24 Aug 2022 22:15:24 +0000 (01:15 +0300)
committerDmitry Gutov <dgutov@yandex.ru>
Wed, 24 Aug 2022 22:16:10 +0000 (01:16 +0300)
commitbc8141594d67fcb95dc58e031d811aee0dbf96e0
tree5acd71b0e6bc1db094635b5f0dc5d1a25b1e7f59tree | snapshot
parent78923c5f4e26d3cb9fbaf0dbf2d04c523482e52ccommit | diff
vc-merge: Look for 'merge-file' instead of 'merge'

* lisp/vc/vc.el (vc-merge):
Look for 'merge-file' in second clause (bug#50258).
lisp/vc/vc.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.