When I do a 'cvs update' and there are conflicts, diff-like text is put into the text.
Is there some way to prevent this without preventing the normal update merge, which is very nice? I don't always catch these conflicts on a large project until I try to compile and the compiler barfs on the diff text. It'd also be nice to use a visual merge tool to resolve these rather than hack the text. -- Time has slipped away. / Your life is stolen. / You tarried with trifles, / Victim of your folly. - "Dirge for Jamis on the Funeral Plain," from "Songs of Muad'Dib" by the Princess Irulan _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
