← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Martin Pool
  • Date: 2010-02-23 07:43:11 UTC
  • mfrom: (4797.2.20 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: mbp@sourcefrog.net-20100223074311-gnj55xdhrgz9l94e
Merge 2.1 back to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
130
130
        """
131
131
        affected_files = self.affected_files
132
132
        if affected_files is None:
133
 
            config = self.merger.this_tree.branch.get_config()
 
133
            config = self.merger.this_branch.get_config()
134
134
            # Until bzr provides a better policy for caching the config, we
135
135
            # just add the part we're interested in to the params to avoid
136
136
            # reading the config files repeatedly (bazaar.conf, location.conf,