[PREVIEW] line-endings support

[Stephen J. Turnbull]

Aaron Bentley writes:

 > You are conflating "branch configuration", which I was talking about,

Oh, you mean what other systems call "user preferences", ie,
locations.conf (formerly "branches.conf", I wonder why that got
changed, eh?) and branch.conf?  Then I agree, in principle this kind
of configuration shouldn't be merged just because J. R. Hacker changed
it in his personal copy.