/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: John Arbash Meinel
  • Date: 2007-02-09 23:15:53 UTC
  • mto: This revision was merged to the branch mainline in revision 2294.
  • Revision ID: john@arbash-meinel.com-20070209231553-9ywoxs2t3dsx667s
Make sure xml5 can handle unicode or utf8 strings

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py