Viewing all changes in revision 3514.2.13.
- Committer: John Arbash Meinel
- Date: 2008-07-13 00:30:42 UTC
- mto: This revision was merged to the branch mainline in revision 3543.
- Revision ID: john@arbash-meinel.com-20080713003042-ak1b725ck5vmpbmi
Add the ability to prune extra tails from the parent_map.
Now we can get the right answer without having to add extra history.
Now we can get the right answer without having to add extra history.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
