« back to all changes in this revision
Viewing changes to bzrlib/selftest/test_ancestry.py
- Committer: Aaron Bentley
- Date: 2005-11-12 15:17:02 UTC
- mto: (1185.67.11 bzr.revision-storage) (1534.1.15 integration)
- mto: This revision was merged to the branch mainline in revision 1550.
- Revision ID: aaron.bentley@utoronto.ca-20051112151702-25c7bd32b3bd0b9e
Fixed inner merges in status
- files modified:
- bzrlib/selftest/blackbox.py
added
removed
bzrlib/selftest/test_ancestry.py
