← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/ignores.py

Merge bzr.dev to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/ignores.py
42
42
    '.#*',
43
43
    '[#]*#',
44
44
    '__pycache__',
 
45
    'bzr-orphans',
45
46
]
46
47
 
47
48