← Back to branch summary

~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 5898.1.4.

  • Committer: Martin
  • Date: 2011-05-21 16:36:51 UTC
  • mto: This revision was merged to the branch mainline in revision 5907.
  • Revision ID: gzlist@googlemail.com-20110521163651-rzthrj6ll0ak4gvn
Use unicode() not str() to stringify conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: