← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_merge_core.py

  • Committer: Aaron Bentley
  • Date: 2006-01-24 15:33:55 UTC
  • mto: (1185.50.54 bzr-jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1550.
  • Revision ID: abentley@panoramicfeedback.com-20060124153355-8d91160257425086
Fixed up non-absolute imports

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_merge_core.py
3
3
from tempfile import mkstemp
4
4
 
5
5
from bzrlib import _changeset
6
 
from _changeset import Inventory, apply_changeset, invert_dict
 
6
from bzrlib._changeset import Inventory, apply_changeset, invert_dict
7
7
from bzrlib.osutils import backup_file, rename, pathjoin
8
8
from bzrlib.merge3 import Merge3
9
9
import bzrlib
10
10
from bzrlib.atomicfile import AtomicFile
11
 
from _changeset import get_contents
 
11
from bzrlib._changeset import get_contents
12
12
 
13
13
 
14
14
class ApplyMerge3: