← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

Fix doc string.

* bzrlib/conflicts.py:
(ContentsConflict): Is used for binary files too.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
469
469
 
470
470
 
471
471
class ContentsConflict(PathConflict):
472
 
    """The files are of different types, or not present"""
 
472
    """The files are of different types (or both binary), or not present"""
473
473
 
474
474
    has_files = True
475
475