/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: Gordon Tyler
  • Date: 2011-09-09 12:42:32 UTC
  • mto: (6015.33.4 2.4)
  • mto: This revision was merged to the branch mainline in revision 6134.
  • Revision ID: gordon@doxxx.net-20110909124232-ip0bgx4tx6y5fya6
https://launchpad.net/bugs/828803
Use get_user_option in get_merge_tools so that quoted values are correctly unquoted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
573
573
        for (oname, value, section, conf_id, parser) in self._get_options():
574
574
            if oname.startswith('bzr.mergetool.'):
575
575
                tool_name = oname[len('bzr.mergetool.'):]
576
 
                tools[tool_name] = value
 
576
                tools[tool_name] = self.get_user_option(oname)
577
577
        trace.mutter('loaded merge tools: %r' % tools)
578
578
        return tools
579
579