Viewing all changes in revision 1545.2.1.
- Committer: Aaron Bentley
- Date: 2006-01-17 21:09:42 UTC
- mto: (1534.7.81 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-20060117210942-353e1f1c77a1b6b4
Made the merge internals private
- files renamed:
- bzrlib/changeset.py => bzrlib/_changeset.py
- bzrlib/merge_core.py => bzrlib/_merge_core.py
- files modified:
- bzrlib/builtins.py
expand all
collapse all
added
removed
