← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_missing.py

first cut at merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_missing.py
17
17
import os
18
18
 
19
19
 
 
20
from bzrlib.builtins import merge
20
21
from bzrlib.missing import find_unmerged
21
 
from bzrlib.merge import merge
22
22
from bzrlib.tests import TestCaseWithTransport
23
23
from bzrlib.workingtree import WorkingTree
24
24
 
 
25
 
25
26
class TestMissing(TestCaseWithTransport):
26
27
 
27
28
    def test_find_unmerged(self):