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

  • Committer: Jelmer Vernooij
  • Date: 2018-06-21 23:03:42 UTC
  • mto: This revision was merged to the branch mainline in revision 6996.
  • Revision ID: jelmer@jelmer.uk-20180621230342-yl9vbifwc2x4ltvt
Avoid text_type()

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/merge.py
842
842
                self.tt.iter_changes(), self.change_reporter)
843
843
        self.cook_conflicts(fs_conflicts)
844
844
        for conflict in self.cooked_conflicts:
845
 
            trace.warning(text_type(conflict))
 
845
            trace.warning('%s', conflict.describe())
846
846
 
847
847
    def _entries3(self):
848
848
        """Gather data about files modified between three trees.