Viewing all changes in revision 5246.2.23.
- Committer: Andrew Bennetts
- Date: 2010-06-22 07:20:14 UTC
- mto: (5050.3.16 2.2)
- mto: This revision was merged to the branch mainline in revision 5365.
- Revision ID: andrew.bennetts@canonical.com-20100622072014-q9yz0zje3e2gxl8h
Fix XXX by adding a test for that case, and don't use AssertionError for a legitimate user error.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
