~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 5898.1.2.

  • Committer: Martin
  • Date: 2011-05-20 11:33:30 UTC
  • mto: This revision was merged to the branch mainline in revision 5907.
  • Revision ID: gzlist@googlemail.com-20110520113330-2prwiiawcrg879d7
Add prefix param to conflict creation function in bb.test_conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: