On Tue, 23 Feb 1999, Steve Dickey wrote:
How do I use ediff from within PCL-CVS to examine changes when a file
marked as -patched- by cvs?
Currently, I get an error that: ediff can only merge files marked....
I only have read access to the xemacs tree.
Or am I doing something really stupid?
Maybe the following is related, but maybe not.
I recall vc-cvs being confused if:
a) Check out a file
b) Modify the file locally, don't commit
c) Repository file is amended by another user
d) 'cvs update', which results in a merge
The CVS/Entries entry was:
/jiffies_thread.c/1.4/Result of merge//
It didn't consider jiffies_thread.c here as a file under CVS control.