[cvsnt] $Log$ conflicts in CVSNT but NOT in Linux CVS - why?

[Glen Starrett]

> You can't merge any $...$ keywords in Linux CVS except $Log$, and only
> then because of the way it works (because it preserves its existing
> contents by default).  Since $Log$ isn't that useful and merging the
> other keywords is potentially much more useful, breaking that one case
> is OK - it's personally saved me many hours of mucking around being
> able to merge $Id$ for example.

So that's why I stopped getting conflicts on $Id$ merges... THANK YOU!!!!  I
didn't realize it when the change came around, the conflicts just stopped.

Regards,

Glen Starrett