← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Andrew Bennetts
  • Date: 2010-06-15 03:08:31 UTC
  • mto: This revision was merged to the branch mainline in revision 5294.
  • Revision ID: andrew.bennetts@canonical.com-20100615030831-78s16nmrfiv3wdcn
Revert debugging change accidentally committed by Gordon Tyler.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1455
1455
    def get_lines(self, tree, file_id):
1456
1456
        """Return the lines in a file, or an empty list."""
1457
1457
        if tree.has_id(file_id):
1458
 
            return tree.get_file(file_id).readlines()
 
1458
            return tree.get_file_lines(file_id)
1459
1459
        else:
1460
1460
            return []
1461
1461