[PREVIEW] line-endings support

[Aaron Bentley]

-----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.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIBiWT0F+nu1YWqI0RAvl+AKCJiY8+bay+NkjlOgj1a3iXZtGvDQCfU0Ot
F+f41fHVpHKp2lGljUl01ZY=
=27w4
-----END PGP SIGNATURE-----