~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_resolve.py

  • Committer: Jonathan Lange
  • Date: 2012-10-22 15:51:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6571.
  • Revision ID: jml@canonical.com-20121022155131-vmkbs89a8kpdsxju
Document the behaviour

Show diffs side-by-side

added added

removed removed

Lines of Context: