David Jencks wrote: > cvs update -j HEAD <myfile>
If you do this: cvs update -kk -j HEAD <myfile> The merge will work better, because it kills keyword expansion. Note, don't do this on a binary file, as binary files need -kb and -kk turns -kb off. -dain _______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
