← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/textmerge.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-18 20:47:13 UTC
  • mto: (6437.3.15 2.5)
  • mto: This revision was merged to the branch mainline in revision 6444.
  • Revision ID: jelmer@samba.org-20120118204713-euscpwhl8qzf91yn
https://launchpad.net/bugs/891646
Report present but unused colocated branches in `bzr info`.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/textmerge.py
17
17
# Author: Martin Pool <mbp@canonical.com>
18
18
#         Aaron Bentley <aaron.bentley@utoronto.ca>
19
19
 
 
20
from __future__ import absolute_import
20
21
 
21
22
from bzrlib.lazy_import import lazy_import
22
23
lazy_import(globals(), """