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