← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_reconcile.py

merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_reconcile.py
1
 
# Copyright (C) 2006, 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2008-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
23
23
    tests,
24
24
    )
25
25
from bzrlib.reconcile import reconcile, Reconciler
26
 
from bzrlib.revision import Revision
27
26
from bzrlib.tests import per_repository
28
 
from bzrlib.workingtree import WorkingTree
29
27
 
30
28
 
31
29
class TestWorksWithSharedRepositories(per_repository.TestCaseWithRepository):