← Back to branch summary

~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 4597.5.5.

  • Committer: Vincent Ladeuil
  • Date: 2009-12-25 16:15:23 UTC
  • mto: (4597.3.53 description)
  • mto: This revision was merged to the branch mainline in revision 5009.
  • Revision ID: v.ladeuil+lp@free.fr-20091225161523-l30yv8uv7l13vfzs
More cleanup.

* bzrlib/tests/blackbox/test_conflicts.py:
(TestConflictsBase, TestConflicts, TestResolve): Splitted for
better readability.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: