Viewing all changes in revision 3062.2.9.
- Committer: Aaron Bentley
- Date: 2007-12-09 23:53:50 UTC
- mto: This revision was merged to the branch mainline in revision 3133.
- Revision ID: aaron.bentley@utoronto.ca-20071209235350-qp39yk0xzx7a4f6p
Don't use the base if not cherrypicking
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
