~bzr-pqm/bzr/bzr.dev

Committer: Patch Queue Manager
Date: 2011-09-12 12:35:20 UTC
mfrom: (6015.35.3 828803-get_merge_tools-2.4)
mto: (6133.1.1 trunk) (6015.44.1 2.4) (6165.1.1 trunk) (6191.1.1 trunk) (6201.1.1 dev_2.4_integration) (6205.1.1 2.4-into-2.5) (6206.1.1 2.5-client-reconnect-819604) (6232.1.1 dev_2.4_integration) (6234.1.1 trunk) (6256.1.1 dev_2.4_integration) (6344.1.1 dev_2.4_integration) (6437.2.1 2.5b5-dev)
mto: This revision was merged to the branch mainline in revision 6134.
Revision ID: pqm@pqm.ubuntu.com-20110912123520-avjojdd1q64hjxe3

(jelmer) Allow the uses of spaces in merge tools paths. (Gordon Tyler)

added added

removed removed

Bug Fixes

*********

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

or undesirable results.

* Fixed loading of external merge tools from config to properly decode

command-lines which contain embedded quotes. (Gordon Tyler, #828803)

Documentation

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