Viewing all changes in revision 3514.4.37.
- Committer: John Arbash Meinel
- Date: 2008-08-01 18:04:17 UTC
- mto: (3697.7.4 1.7)
- mto: This revision was merged to the branch mainline in revision 3748.
- Revision ID: john@arbash-meinel.com-20080801180417-z3itgrfu0ai91mgq
Tests pass when using _entries_lca as the default algorithm.
The only test that doesn't pass is a bug in MultiWalker, which has a fix
being merged already.
The only test that doesn't pass is a bug in MultiWalker, which has a fix
being merged already.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
