CVS: How to avoid conflicts due to RCS keywords when merging ?

[Martin Baulig <martin home-of-linux org>]

-----BEGIN PGP SIGNED MESSAGE-----

Hi,

I've got some problem when merging the stable branch of libgtop into
the main trunk, because of my '$Id' at the beginning of each C source
I get conflicts during the merge in each file which I have to solve
manually. Is there some easy way to avoid this, i.e. to tell
'cvs update -j <branch>' to consider files that only differ in RCS
keywords as identical ?

Martin

- -----------------------------------------------------------------
   Martin Baulig - Angewandte Mathematik - Universitaet Trier

   baulig@castor.uni-trier.de, http://www.home-of-linux.org/
   Key: 1024-bit key with ID C8178435 created 1997/01/24 
   ID:  67 C1 84 A0 47 F5 11 C5  5F 68 4C 84 99 05 C3 92
   Finger me for public key or fetch finger.txt from the url above
- ------------------------------------------------------------------



-----BEGIN PGP SIGNATURE-----
Version: 2.6.3i
Charset: noconv

iQCVAwUBNXm//oA8K7jIF4Q1AQFnjQP/X0Ztr2O6pSrYCqbq/nyXDa58irydvgHh
p8ekeT0y8m77iENMrd6IIHROqunnzhhwLaBp2gld2R1AtyZCh32etarnH5zBXFUz
AqaKqFfPvxBCDtYwTFisEMelAg8qscr5lpH+E6UNbm4z9o+/LRblGcUxobCTZEz2
a4Hq8ZjwlOg=
=3sYL
-----END PGP SIGNATURE-----