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/tests/blackbox/test_reconcile.py
- Committer: Aaron Bentley
- Date: 2006-05-20 17:51:13 UTC
- mfrom: (1718 +trunk)
- mto: This revision was merged to the branch mainline in revision 1727.
- Revision ID: aaron.bentley@utoronto.ca-20060520175113-4549e0023f9210bf
Merge from bzr.dev
- files added:
- bzrlib/benchmarks
- bzrlib/plugins/launchpad
- files removed:
- notes
- files renamed:
- bzrlib/tests/test_annotate.py => bzrlib/tests/blackbox/test_annotate.py
- bzrlib/tests/test_uncommit.py => bzrlib/tests/blackbox/test_uncommit.py
- bzrlib/tests/test_basis_inventory.py => bzrlib/tests/workingtree_implementations/test_basis_inventory.py
- tutorial.txt => doc/tutorial.txt
- files modified:
- BRANCH.TODO
added
removed
bzrlib/tests/blackbox/test_reconcile.py
