From: Eric Niebler (eric_at_[hidden])
Date: 2008-08-04 19:15:57
I'm trying to merge from trunk to my private branch (branches/proto/v4)
using svnmerge.py, and it's failing with the following error:
svn: File 'libs\wave\samples\waveidl\idllexer\idl.re' has inconsistent
newlines
svn: Inconsistent line ending style
Does anybody know how I can work around this?
-- Eric Niebler BoostPro Computing http://www.boostpro.com