/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/merge.py

  • Committer: Aaron Bentley
  • Date: 2006-03-22 04:22:17 UTC
  • mto: This revision was merged to the branch mainline in revision 1620.
  • Revision ID: aaron.bentley@utoronto.ca-20060322042217-bdc20e3a63a9c03b
Fixed merge-type weave

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: