/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/diff.py

  • Committer: Martin
  • Date: 2018-06-30 22:18:39 UTC
  • mfrom: (7010 work)
  • mto: This revision was merged to the branch mainline in revision 7012.
  • Revision ID: gzlist@googlemail.com-20180630221839-98zi78xwcggestse
Merge trunk to fix conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/diff.py
990
990
            properties_changed.extend(get_executable_change(executable[0], executable[1]))
991
991
 
992
992
            if properties_changed:
993
 
                prop_str = b" (properties changed: %s)" % (", ".join(properties_changed),)
 
993
                prop_str = b" (properties changed: %s)" % (
 
994
                        b", ".join(properties_changed),)
994
995
            else:
995
996
                prop_str = b""
996
997