cvs

Matthew Fluet fluet@CS.Cornell.EDU
Thu, 25 Oct 2001 08:42:45 -0400 (EDT)


Does anyone else get "nonmergeable file needs merge" errors on updates?
The last one I got should have been fine -- the changes were independent
and non-overlapping.