Viewing all changes in revision 1545.2.6.
- Committer: Aaron Bentley
- Date: 2006-01-20 14:22:58 UTC
- mto: (1534.7.94 Transactional Tree Transforms) (1185.50.54 bzr-jam-integration)
- mto: This revision was merged to the branch mainline in revision 1550.
- Revision ID: abentley@panoramicfeedback.com-20060120142258-9d09d6ff707ebd1f
Removed _merge, renamed MergeConflictHandler to _MergeConflictHandler
- files removed:
- bzrlib/_merge.py
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
