~bzr-pqm/bzr/bzr.dev

Committer: Patch Queue Manager
Date: 2012-03-27 17:07:04 UTC
mfrom: (6437.52.1 2.5-help-branches-fix)
mto: (6437.67.1 2.5.2-dev) (6524.1.1 bzr.dev) (6531.1.1 merge-2.5) (6548.1.1 trunk) (6549.3.1 dev_2.5_integration) (6562.1.1 2.6-merge-up-2.5) (6574.1.1 integration) (6576.1.4 trunk) (6578.1.1 2.6-merges-2.5)
mto: This revision was merged to the branch mainline in revision 6513.
Revision ID: pqm@pqm.ubuntu.com-20120327170704-leuw7drzi7exeois

(gz) Implement get_help_topic for ConfigOption. (Jelmer Vernooij)

added added

removed removed

* Fixed merge tool availability checking and invocation to search the

Windows App Path registry in addition to the PATH. (Gordon Tyler, #939605)

* Make sure configuration options can provide their own help topic.

(Jelmer Vernooij, #941672)

Documentation

*************