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"))))