/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: John Arbash Meinel
  • Date: 2006-10-06 05:53:44 UTC
  • mfrom: (2063 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2071.
  • Revision ID: john@arbash-meinel.com-20061006055344-e73b97b7c6ca6e72
[merge] bzr.dev 2063

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
888
888
                name = self.tt.final_name(trans_id)
889
889
                parent_id = self.tt.final_parent(trans_id)
890
890
                self._dump_conflicts(name, parent_id, file_id)
891
 
            self._raw_conflicts.append(('text conflict', trans_id))
 
891
                self._raw_conflicts.append(('text conflict', trans_id))
892
892
        finally:
893
893
            osutils.rmtree(temp_dir)
894
894