[PREVIEW] line-endings support

[Stephen J. Turnbull]

Aaron Bentley writes:
 > -----BEGIN PGP SIGNED MESSAGE-----
 > Hash: SHA1
 > 
 > Stefan Monnier wrote:
 > >> Given source tree foo with branch bar, I can easily imagine foo and bar
 > >> wanting different submission addresses and also wanting to merge one
 > >> another.  That would make the submission address change unexpectedly and
 > > 
 > > That's a more general problem: how to keep 2 branches mutually sync'd
 > > while preserving some differences between them.
 > 
 > That's one way of looking at it, but not the only way.  I view branch
 > configuration data as different from tree content, and see configuration
 > as something that I never want to propagate when I merge.

I doubt that your view is anything like universal, though.  For
example, I imagine that most people would consider .bzrignore to be
"configuration", but also want changes to it to propagate.

Stefan's view *is* more general and the facility would be valuable, so
I hope you will consider addressing the problem on that basis rather
than "content is content and config is config and ne'er the twain
shall meet."