diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-11-18 23:11:26 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-11-18 23:11:26 +0100 |
| commit | 7cf2d5fcf0a3db793678dd6ba9fc1c24d4eeb36a (patch) | |
| tree | 8bd4b8829768fe0195d41a3aa067aa1ac7435605 /lib/git/objects/tree.py | |
| parent | ebe8f644e751c1b2115301c1a961bef14d2cce89 (diff) | |
| parent | 9519f186ce757cdba217f222c95c20033d00f91d (diff) | |
| download | gitpython-7cf2d5fcf0a3db793678dd6ba9fc1c24d4eeb36a.tar.gz | |
Merge branch 'refactor' into submodule
Diffstat (limited to 'lib/git/objects/tree.py')
| -rw-r--r-- | lib/git/objects/tree.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/git/objects/tree.py b/lib/git/objects/tree.py index 68c1ef2d..67431686 100644 --- a/lib/git/objects/tree.py +++ b/lib/git/objects/tree.py @@ -7,7 +7,7 @@ import util from base import IndexObject from git.util import join_path from blob import Blob -from submodule import Submodule +from submodule.base import Submodule import git.diff as diff from fun import ( |