Viewing all changes in revision 5898.1.5.
- Committer: Martin
- Date: 2011-05-21 16:39:24 UTC
- mto: This revision was merged to the branch mainline in revision 5907.
- Revision ID: gzlist@googlemail.com-20110521163924-5kg8f5lollmlpabl
Provide __unicode__ not __str__ so callers fall back to repr unless they handle non-ascii strings
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
