Viewing all changes in revision 1551.20.2.
- Committer: Aaron Bentley
- Date: 2007-12-17 16:04:08 UTC
- mto: (1551.19.24 Aaron's mergeable stuff)
- mto: This revision was merged to the branch mainline in revision 3187.
- Revision ID: abentley@panoramicfeedback.com-20071217160408-cyyassjx3lsw088c
Merge prefers submit branch, but falls back to parent branch
- files modified:
- bzrlib/builtins.py
expand all
collapse all
added
removed
