diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2011-06-07 21:36:42 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2011-06-07 21:36:42 +0200 |
| commit | 58a930a632c867b65b9a3802e2f4190cf32e33ee (patch) | |
| tree | 95b1311a3a4bfcdf4c2dba66f360e6985184013e /git/index/fun.py | |
| parent | a98e0af511b728030c12bf8633b077866bb74e47 (diff) | |
| parent | f6897c78be5a5530129df50742cb6cabfb8609c9 (diff) | |
| download | GitPython-58a930a632c867b65b9a3802e2f4190cf32e33ee.tar.gz GitPython-58a930a632c867b65b9a3802e2f4190cf32e33ee.zip | |
Merge branch 'gitdbmerger'
Diffstat (limited to 'git/index/fun.py')
| -rw-r--r-- | git/index/fun.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git/index/fun.py b/git/index/fun.py index 9b35bf04..e2813c0b 100644 --- a/git/index/fun.py +++ b/git/index/fun.py @@ -36,8 +36,8 @@ from util import ( unpack ) -from gitdb.base import IStream -from gitdb.typ import str_tree_type +from git.base import IStream +from git.typ import str_tree_type __all__ = ('write_cache', 'read_cache', 'write_tree_from_cache', 'entry_key', 'stat_mode_to_index_mode', 'S_IFGITLINK') |