Viewing all changes in revision 5246.2.15.
- Committer: Andrew Bennetts
- Date: 2010-06-04 01:49:28 UTC
- mto: (5050.3.16 2.2)
- mto: This revision was merged to the branch mainline in revision 5365.
- Revision ID: andrew.bennetts@canonical.com-20100604014928-q4i0zk7vqq4ab89k
Lazy import most things in merge.py, to minimise the impact of plugins that need to import bzrlib.merge to install a hook.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
