Miller Dale Contractor HQ AFWA writes: > > I believe that a file can be commited with conflict markers if the file has > been touched since the time stamp in the CVS/Entries for the merge with > conflicts.
You're right -- I had forgotten about that change. Of course, you *do* get a warning message, so you deserve what you get if you ignore it. -Larry Jones Even my FRIENDS don't do what I want. -- Calvin _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
