Viewing all changes in revision 2644.1.2.
- Committer: Wouter van Heyst
- Date: 2007-07-21 15:32:37 UTC
- mto: This revision was merged to the branch mainline in revision 2645.
- Revision ID: larstiq@larstiq.dyndns.org-20070721153237-rh7v5kz6rh3r2mza
As Aaron explained #127115 is more general, failing whenever other's basis is an ancestor of this' basis.
- files modified:
- bzrlib/tests/test_merge.py
expand all
collapse all
added
removed
