/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/plugins/weave_fmt/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-21 02:50:08 UTC
  • mto: This revision was merged to the branch mainline in revision 7207.
  • Revision ID: jelmer@jelmer.uk-20181121025008-tiutar263ri5rvkm
Undo removal of kind.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/weave_fmt/workingtree.py
208
208
 
209
209
    def _iter_conflicts(self):
210
210
        conflicted = set()
211
 
        for path, file_class, entry in self.list_files():
 
211
        for path, file_class, file_kind, entry in self.list_files():
212
212
            stem = get_conflicted_stem(path)
213
213
            if stem is None:
214
214
                continue