Viewing all changes in revision 3514.2.5.
- Committer: John Arbash Meinel
- Date: 2008-07-09 23:21:13 UTC
- mto: This revision was merged to the branch mainline in revision 3543.
- Revision ID: john@arbash-meinel.com-20080709232113-qvkxigm18om27i39
Switch to the get_parent_map design I had settled on.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
