Viewing all changes in revision 6259.3.1.
- Committer: Martin Packman
- Date: 2011-11-14 15:37:04 UTC
- mto: This revision was merged to the branch mainline in revision 6319.
- Revision ID: martin.packman@canonical.com-20111114153704-7d6z5e9h683vypaf
Relocate merge type registry to bzrlib.merge from bzrlib.option
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
