On Mon, Jan 07, 2002 at 04:39:17PM -0500, Greg A. Woods wrote: > My version shows all the conflicting lines from all the three files, not > just the latter two, and I find this almost infinitely easier to deal > with when manually resolving the conflicts. > > <<<<<<< somefile > changed line[s] unique to local copy of somefile > changed line[s] unique to local copy of somefile > changed line[s] unique to local copy of somefile > ||||||| 1.X > matching line[s] unique to version 1.X of somefile > matching line[s] unique to version 1.X of somefile > matching line[s] unique to version 1.X of somefile > ======= > matching line[s] unique to version 1.Y of somefile > matching line[s] unique to version 1.Y of somefile > matching line[s] unique to version 1.Y of somefile > >>>>>>> 1.Y
This is very similar to what Perforce does. I haven't yet decided if I like it or not. But I think it would be neat to have a cvs up -gw option. ;-> mrc -- Mike Castle [EMAIL PROTECTED] www.netcom.com/~dalgoda/ We are all of us living in the shadow of Manhattan. -- Watchmen fatal ("You are in a maze of twisty compiler features, all different"); -- gcc _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs