Viewing all changes in revision 1610.2.4.
- Committer: James Blackwell
- Date: 2006-05-05 01:05:04 UTC
- mfrom: (1697 +trunk)
- mto: This revision was merged to the branch mainline in revision 1700.
- Revision ID: jblack@merconline.com-20060505010504-264cb48507e53b64
merged mainline
- files added:
- bzrlib/tests/blackbox/test_merge.py
- 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
- files modified:
- BRANCH.TODO
expand all
collapse all
added
removed
