Viewing all changes in revision 5540.1.7.
- Committer: Gary van der Merwe
- Date: 2010-11-18 08:22:54 UTC
- mto: This revision was merged to the branch mainline in revision 5543.
- Revision ID: garyvdm@gmail.com-20101118082254-fxw2ve68by9ydg86
Add mutter for when we cant find a unique lca, and what revision we used as a base_rev_id.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
