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

* lisp/vc/vc.el (vc-merge):
Look for 'merge-file' in second clause (bug#50258).

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index b05adfb2d547d6aa0a64a02e45db95dfd7ff63d8..85a96a29fa3d936c03b53f65a3d34f3e2874c399 100644 (file)
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -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))