Viewing all changes in revision 4597.8.1.
- Committer: Vincent Ladeuil
- Date: 2010-03-10 13:23:01 UTC
- mto: (4597.11.1 537956-parent-loop-incomplete) (5113.1.1 integration) (5114.1.1 various) (5401.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5114.
- Revision ID: v.ladeuil+lp@free.fr-20100310132301-cdjj64niv48yjc7u
Fix doc string.
* bzrlib/conflicts.py:
(ContentsConflict): Is used for binary files too.
* bzrlib/conflicts.py:
(ContentsConflict): Is used for binary files too.
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
