Viewing all changes in revision 5158.5.3.
- Committer: Andrew Bennetts
- Date: 2010-04-22 14:03:56 UTC
- mto: This revision was merged to the branch mainline in revision 5181.
- Revision ID: andrew.bennetts@canonical.com-20100422140356-zv9iwa7eebxwjh2v
Add a test for the allow_objects param of Merge3.
- files modified:
- bzrlib/tests/test_merge3.py
expand all
collapse all
added
removed
