Rev 4629: Fix doc string. in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4629
revision-id: v.ladeuil+lp at free.fr-20100310132301-cdjj64niv48yjc7u
parent: v.ladeuil+lp at free.fr-20100304093723-k62ul8gr0xn953p2
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cleanup
timestamp: Wed 2010-03-10 14:23:01 +0100
message:
  Fix doc string.
  
  * bzrlib/conflicts.py:
  (ContentsConflict): Is used for binary files too.
-------------- next part --------------
=== modified file 'bzrlib/conflicts.py'
--- a/bzrlib/conflicts.py	2010-03-02 07:58:53 +0000
+++ b/bzrlib/conflicts.py	2010-03-10 13:23:01 +0000
@@ -469,7 +469,7 @@
 
 
 class ContentsConflict(PathConflict):
-    """The files are of different types, or not present"""
+    """The files are of different types (or both binary), or not present"""
 
     has_files = True