From: Dmitry Gutov <dgutov@yandex.ru>
Date: Wed, 24 Aug 2022 22:15:24 +0000 (+0300)
Subject: vc-merge: Look for 'merge-file' instead of 'merge'
X-Git-Tag: emacs-29.0.90~1893^2~55
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bc8141594d67fcb95dc58e031d811aee0dbf96e0;p=emacs.git

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 b05adfb2d54..85a96a29fa3 100644
--- 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))