merge on windows

if you have a file with non consistent line-endings in your working
copy (one copied from a samba drive might have cr-lf, and cr), how
should the merge from the repository behave?

1. treat a line ending as line ending
   wheter it is cr, lf, cr-lf
   (like most editors)
2. insist on proper os-specific line ending
   (like notepad)

currently i get behaviour 2 ... and i'm not sure i like it.

__________________________________________________
Do you Yahoo!?
U2 on LAUNCH - Exclusive greatest hits videos
http://launch.yahoo.com/u2

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Nov 8 17:59:04 2002