← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Fix diff3 conflict-reporting bug

Show diffs side-by-side

added added

removed removed

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