« back to all changes in this revision
Viewing changes to bzrlib/tests/test_conflicts.py
- Committer: Martin Pool
- Date: 2006-02-01 13:17:42 UTC
- mfrom: (1185.50.65 bzr-jam-integration)
- mto: (1540.3.6 bzr.dev (Main development branch))
- mto: This revision was merged to the branch mainline in revision 1569.
- Revision ID: mbp@sourcefrog.net-20060201131742-6f81ba01f409cc1a
[merge] jam-integration
- files added:
- bzrlib/tests/blackbox/test_ancestry.py
- tools/doc_generate
- files renamed:
- bzr_man.py => tools/doc_generate/autodoc_man.py
- files modified:
- .bzrignore
added
removed
bzrlib/tests/test_conflicts.py
