Viewing all changes in revision 5582.12.2.
- Committer: Jelmer Vernooij
- Date: 2011-03-03 11:11:21 UTC
- mfrom: (5582.10.74 weave-fmt-plugin)
- mto: (5582.10.76 weave-fmt-plugin)
- mto: This revision was merged to the branch mainline in revision 5718.
- Revision ID: jelmer@samba.org-20110303111121-gfboyc06qnwybzgu
Merge main branch.
- files added:
- bzrlib/tests/test_controldir.py
- files modified:
- bzrlib/branch.py
expand all
collapse all
added
removed
