From 435d183a4c62423af85a50b51b7834583373ca49 Mon Sep 17 00:00:00 2001 From: Jonathan Kamens Date: Sun, 6 Oct 2002 09:38:27 -0800 Subject: [PATCH] Fix a bug in the logic for determining whether to use smerge-ediff or backend-specific conflict resolution. [git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 2215] --- vc-p4.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vc-p4.el b/vc-p4.el index d1a0b95..f82d368 100644 --- a/vc-p4.el +++ b/vc-p4.el @@ -200,8 +200,8 @@ visiting FILE." (if (fboundp 'smerge-mode) (smerge-mode 1)) (if (y-or-n-p "Conflicts detected. Resolve them now? ") (if (and (fboundp 'smerge-ediff) - (not (vc-find-backend-function (vc-backend file) - 'resolve-select-yours))) + (not (fboundp (vc-make-backend-sym (vc-backend file) + 'resolve-select-yours)))) (smerge-ediff) (vc-resolve-conflicts name-A name-B)) (message "File contains conflict markers"))))