Viewing all changes in revision 974.1.7.
- Committer: Aaron Bentley
- Date: 2005-07-28 13:37:16 UTC
- mto: (1092.1.41) (1185.3.4) (974.1.47)
- mto: This revision was merged to the branch mainline in revision 1020.
- Revision ID: abentley@panoramicfeedback.com-20050728133716-be4588fe02a977f0
Fixed handling of merge factory in test suite
- files modified:
- bzrlib/merge_core.py
expand all
collapse all
added
removed
