Martin Jørgensen <[EMAIL PROTECTED]> writes: [...] > I was also interested in finding out how to resolve the conflict > supposing that the file actually was important.... Something about > this diff-utility, right?
To resolve conflict(s) one usually uses his favorite text editor. Did you consider to read the fine manual, e.g., at <http://ximbiot.com/cvs/manual/cvs-1.11.21/cvs.html>, and <http://ximbiot.com/cvs/manual/cvs-1.11.21/cvs_10.html#SEC85> in particular? -- Sergei. _______________________________________________ Info-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/info-cvs
