Eric Siegerman writes:
>
> Says:
> $ cvs update
> cvs update: Updating .
> RCS file: /home/erics/t2/Repos/p/Attic/foo,v
> retrieving revision 1.1
> retrieving revision 1.2
> Merging differences between 1.1 and 1.2 into foo
> foo already contains the differences between 1.1 and 1.2
> $
>
> Shouldn't it have reported a conflict?
Yes, it should. Thanks for the analysis, I've checked in a fix.
-Larry Jones
I never get to do anything fun. -- Calvin
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
