Viewing all changes in revision 3514.4.1.
- Committer: John Arbash Meinel
- Date: 2008-07-22 02:05:29 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-20080722020529-58d4f9mtxd2p5dvm
Update Merger to set a flag when we encounter a criss-cross merge.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
