← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

(gz) Fix unicode handling in bzrlib.conflicts ui code (Martin [gz])

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
888
888
                self.tt.iter_changes(), self.change_reporter)
889
889
        self.cook_conflicts(fs_conflicts)
890
890
        for conflict in self.cooked_conflicts:
891
 
            trace.warning(conflict)
 
891
            trace.warning(unicode(conflict))
892
892
 
893
893
    def _entries3(self):
894
894
        """Gather data about files modified between three trees.