OK I grabbed Value: "R-2_0-Beta_2" Documentation: pcl-cvs.el,v 1.117 1998/01/28 17:23:55 woods Exp Now it seems that "e" (ediff) in cvs doesn't work for files marked "conflict". Here's what happens: Signaling: (wrong-type-argument stringp nil) expand-file-name(nil) find-file-noselect(nil) cvs-run-ediff-on-file-descriptor([[[... #1 ...] #0 (WRAPPER . ...)] [#0 [#1 ... ...] (WRAPPER . ...)] (WRAPPER . [#<marker at 556 in *cvs* 0x82bb864> ...])]) run-ediff-from-cvs-buffer(578) cvs-mode-ediff(578) call-interactively(cvs-mode-ediff)