"Jeffrey D. Brekke" <[EMAIL PROTECTED]> writes: > On 9 Dec 2002, Daniel Rall wrote: > > > [EMAIL PROTECTED] writes: > > [snipped some here] > > > > * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a> > > > + * @author <a href="mailto:[EMAIL PROTECTED]";>Henning P. Schmiedehausen</a> > > > + * @version $Id$ > > > */ > > > public interface TurbineConstants > > > { > > > > I'd rather that these CVS keywords were left out. They make merging > > between branches a PITA. > > Can't you use the -kk switch for non-binary files? Then these keywords > don't bite you on merges. Or the perfect solution, don't use branches ;)
One can, but _I_ would prefer not to have to deal with it. -- Daniel Rall <[EMAIL PROTECTED]> -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
