Paul Sander wrote:
CVS notices the conflicting changes and produces a working copy of the file that contains Person1's removed lines and Person2's inserted lines, with special mark-ups to draw attention to the problem. It also leaves copies of both contributors in the user's workspace.
Not quite. CVS will only rename your working copy to .#[filename].[cvs revision]. To see the other person's contributions you need to use 'cvs diff' on the pre- and post-modification revisions.
-- Jim _______________________________________________ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
