[MERGE] Rule-based preferences (EOL part 1 of 3)

[Stephen J. Turnbull]

John Arbash Meinel writes:
 > Which is a bit of a shame, as we even have a .bzr/README that says
 > you shouldn't edit things here.

How about this?

$ mkdir .bzr/internal
$ mv .bzr/* .bzr/internal/

and then pull all the user-visible stuff (all two or three at this
point, .bzrignore and branch.conf, right?) back into .bzr itself.

<duck />