procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vc-merge: Look for 'merge-file' instead of 'merge'

Browse source 
* lisp/vc/vc.el (vc-merge):
Look for 'merge-file' in second clause (bug#50258).
This commit is contained in:
Dmitry Gutov 2022-08-25 01:15:24 +03:00
parent 78923c5f4e
commit bc8141594d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/vc/vc.el
View file

@ -2294,7 +2294,7 @@ changes from the current branch."
((vc-find-backend-function backend 'merge-branch)
(vc-call-backend backend 'merge-branch))
;; Otherwise, do a per-file merge.
((vc-find-backend-function backend 'merge)
((vc-find-backend-function backend 'merge-file)
(vc-buffer-sync)
(dolist (file files)
(let* ((state (vc-state file))