diff options
author | Sebastian Thiel <byronimo@gmail.com> | 2010-11-18 23:11:32 +0100 |
---|---|---|
committer | Sebastian Thiel <byronimo@gmail.com> | 2010-11-18 23:11:32 +0100 |
commit | f1545bd9cd6953c5b39c488bf7fe179676060499 (patch) | |
tree | 8bd4b8829768fe0195d41a3aa067aa1ac7435605 /lib/git/objects/tree.py | |
parent | a1d1d2cb421f16bd277d7c4ce88398ff0f5afb29 (diff) | |
parent | 7cf2d5fcf0a3db793678dd6ba9fc1c24d4eeb36a (diff) | |
download | gitpython-f1545bd9cd6953c5b39c488bf7fe179676060499.tar.gz |
Merge branch '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 ( |