Viewing all changes in revision 3514.2.7.
- Committer: John Arbash Meinel
- Date: 2008-07-10 20:22:41 UTC
- mto: This revision was merged to the branch mainline in revision 3543.
- Revision ID: john@arbash-meinel.com-20080710202241-7se48gbsuxm7ih4h
Fix the failing test by implementing the fallback logic.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
