[news.eclipse.tools] CVS tags create merge conflicts

[rohmer@xxxxxxxx (Heinz Rohmer)]

Hi all

We have a question about CVS merging:

During a merge between 2 branches we have a
conflict in each java file. Most of the time
there is just a simple difference in the
CVS tags, e.g.:
 * @version    $Revision: 1.5.6.4 $   <->  * @version    $Revision: 1.7 $


Is there a way learning eclipse to 
ignore CVS tags?

Thanks for your support
~Heinz