Viewing all changes in revision 5246.2.25.
- Committer: Andrew Bennetts
- Date: 2010-06-22 08:02:04 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-20100622080204-i5ambafqje9b0klf
Add another blackbox test, rename Wrapper to _Wrapper, and document the API of the merge_into_helper function.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
