~bzr-pqm/bzr/bzr.dev

Committer: Patch Queue Manager
Date: 2012-02-29 10:55:06 UTC
mfrom: (6437.44.2 bug939605-2.5)
mto: (6437.54.1 2.5) (6492.1.1 trunk) (6498.1.1 trunk) (6507.1.1 trunk) (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 6493.
Revision ID: pqm@pqm.ubuntu.com-20120229105506-l9sv0vluiazr4j0f

(gz) Locate applications using the windows registry in addition to the PATH
envvar (Gordon Tyler)

added added

removed removed

.. Fixes for situations where bzr would previously crash or give incorrect

or undesirable results.

* Fixed merge tool availability checking and invocation to search the

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

Documentation

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