To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 3514.4.2.
- Committer: John Arbash Meinel
- Date: 2008-07-22 02:15:04 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-20080722021504-swide022hwjx7a7z
Extract the lca trees and the base tree when we find a criss-cross
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
