~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/commands/test_merge.py

  • Committer: Martin Pool
  • Date: 2005-05-11 04:25:35 UTC
  • Revision ID: mbp@sourcefrog.net-20050511042535-286238ce7dcd6ebb
- remove compare_inventories() in favor of compare_trees()
- add basic tests for bzr log

Show diffs side-by-side

added added

removed removed

Lines of Context: