/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Alexander Belchenko
  • Date: 2008-02-06 10:07:17 UTC
  • mfrom: (3211 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3230.
  • Revision ID: bialix@ukr.net-20080206100717-wnixj1s8u2fks08r
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
385
385
        merger.merge_type = _mod_merge.Merge3Merger
386
386
        tree_merger = merger.make_merger()
387
387
        tt = tree_merger.make_preview_transform()
 
388
        self.addCleanup(tt.finalize)
388
389
        preview_tree = tt.get_preview_tree()
389
390
        tree_file = this_tree.get_file('file-id')
390
391
        try: