Merge lp:~doxxx/bzr/828803-get_merge_tools-2.4 into lp:bzr/2.4
Proposed by
Gordon Tyler
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Jelmer Vernooij | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 6046 | ||||
Proposed branch: | lp:~doxxx/bzr/828803-get_merge_tools-2.4 | ||||
Merge into: | lp:bzr/2.4 | ||||
Diff against target: |
49 lines (+6/-4) 3 files modified
bzrlib/config.py (+1/-1) bzrlib/tests/test_config.py (+3/-1) doc/en/release-notes/bzr-2.4.txt (+2/-2) |
||||
To merge this branch: | bzr merge lp:~doxxx/bzr/828803-get_merge_tools-2.4 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij (community) | Approve | ||
Review via email: mp+74773@code.launchpad.net |
Commit message
Allow the uses of spaces in merge tools paths.
Description of the change
Fixes bug 828803 for bzr 2.4.
To post a comment you must log in.
Ideally we should improve ._get_options() to just do the right thing (and there's a comment about that in _show_values), but this seems like a good step in the right direction regardless. I'm going to submit it to pqm.