~bzr-pqm/bzr/bzr.dev

Committer: Canonical.com Patch Queue Manager
Date: 2010-11-29 01:23:53 UTC
mfrom: <a title="Merged From 5519.4.10" href="/~bzr-pqm/bzr/bzr.dev/revision/5519.4.10?remember=5814">(5519.4.10 xdgconfigdir)
Revision ID: pqm@pqm.ubuntu.com-20101129012353-9fn17vlqdmipx4a9

(spiv) Support configuration files located in $XDG_CONFIG_HOME/bazaar (Neil
Martinsen-Burrell) (Andrew Bennetts)

added added

removed removed

number of remaining conflicts. This provides a better feedback about the

whole resolution process. (Vincent Ladeuil)

* Read configuration files in $XDG_CONFIG_HOME/bazaar on Unix if there is

already a directory there. (Neil Martinsen-Burrell, #195397)

Bug Fixes

*********