/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 breezy/plugins/git/tests/test_workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2018-05-21 20:57:42 UTC
  • mto: This revision was merged to the branch mainline in revision 6974.
  • Revision ID: jelmer@jelmer.uk-20180521205742-ix1prudgq6raokjv
Make InterIndexGitTree suitable for use with MemoryGitTree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/tests/test_workingtree.py
29
29
    )
30
30
 
31
31
from .... import conflicts as _mod_conflicts
 
32
from ..tree import (
 
33
    changes_between_git_tree_and_working_copy,
 
34
    )
32
35
from ..workingtree import (
33
36
    FLAG_STAGEMASK,
34
 
    changes_between_git_tree_and_working_copy,
35
37
    )
36
38
from ....tests import TestCaseWithTransport
37
39