← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robert Collins
  • Date: 2006-03-22 13:21:14 UTC
  • mfrom: (1621 +trunk)
  • mto: (1666.1.5 integration)
  • mto: This revision was merged to the branch mainline in revision 1622.
  • Revision ID: robertc@robertcollins.net-20060322132114-cc057ded01411a94
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
797
797
        and a conflict will be noted.
798
798
        """
799
799
        self._check_file(file_id)
800
 
        lines = self._merged_lines(file_id)
 
800
        lines = list(self._merged_lines(file_id))
801
801
        conflicts = '<<<<<<< TREE\n' in lines
802
802
        self.tt.create_file(lines, trans_id)
803
803
        if conflicts: