RCS Keyword Conflicts During Merge (was RE: [cvsnt] Re: minor Bug inupdate in Build 1927)

[Richard Wirth]

Hello Matt,

Wednesday, April 6, 2005, 7:08:35 PM, you wrote:

MS> It that they way to ignore keywords when doing diffs and merges  was to use
MS> the -kk option to prevent keywords from being expanded.

MS> It's worked in all cases for me so far.

As I stated before -- it happend on a regular update not merge!
And for update the use of -kk does complete different thinks than for
merge.

-- 
Best regards,
 Richard                            mailto:r.wirth at wirthware.de