diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/vc/vc.el | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |