← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge3.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-01-11 07:01:27 UTC
  • mfrom: (5579.3.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20110111070127-7cm7qwq6y5t0n36x
(jelmer) Remove some unused imports in the test code. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge3.py
16
16
 
17
17
 
18
18
from bzrlib import (
19
 
    errors,
20
19
    merge3,
21
20
    tests,
22
21
    )
23
 
from bzrlib.merge3 import Merge3
24
22
from bzrlib.errors import CantReprocessAndShowBase, BinaryFile
25
23
 
26
24
def split_lines(t):