[MERGE] Harmonize branch.conf with locations.conf and bazaar.conf

[Martin Pool]

On 20 Jun 2006, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:

> This patch brings branch.conf into the same family as locations.conf and
> bazaar.conf.  It can provide any option that locations.conf or
> bazaar.conf can provide, except for security-sensitive ones.
> 
> Similarly, locations.conf can now provide a branch nick.
> 
> The order of precedence is
> 1. locations.conf
> 2. branch.conf
> 3. bazaar.conf

OK, that sounds good.  But we should think about how to update the
documentation (particularly doc/configuration.txt) to explain this.  (We
can do it here on the list.)  

The patch looks reasonable but I would like someone else to review it
too.

-- 
Martin