Viewing all changes in revision 5898.1.6.
- Committer: Martin
- Date: 2011-05-21 16:43:19 UTC
- mto: This revision was merged to the branch mainline in revision 5907.
- Revision ID: gzlist@googlemail.com-20110521164319-5ua6aoazejsvef0w
Avoid implicit str casting in trace methods by calling unicode() on conflict objects first
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
