/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_missing.py

[merge] jam-integration 1512, includes Storage changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
from bzrlib.missing import find_unmerged
17
17
from bzrlib.branch import Branch
18
 
from bzrlib.merge import merge
 
18
from bzrlib.builtins import merge
19
19
from bzrlib.tests import TestCaseInTempDir
20
20
import os
21
21