From bc8141594d67fcb95dc58e031d811aee0dbf96e0 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Thu, 25 Aug 2022 01:15:24 +0300 Subject: [PATCH] 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)) -- 2.39.2