Viewing all changes in revision 5540.1.3.
- Committer: Gary van der Merwe
- Date: 2010-11-17 13:28:29 UTC
- mto: This revision was merged to the branch mainline in revision 5543.
- Revision ID: garyvdm@gmail.com-20101117132829-650xk61klnoeihm9
Make merge correctly locate a lca where there is a criss-cross merge of a new root.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
