summaryrefslogtreecommitdiff
path: root/lib/git/index/fun.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2010-06-29 20:00:46 +0200
committerSebastian Thiel <byronimo@gmail.com>2010-06-29 20:00:46 +0200
commit77cd6659b64cb1950a82e6a3cccdda94f15ae739 (patch)
tree209b8828310e4926b200152b85ff3b7dbd7a2e1e /lib/git/index/fun.py
parent791765c0dc2d00a9ffa4bc857d09f615cfe3a759 (diff)
downloadgitpython-77cd6659b64cb1950a82e6a3cccdda94f15ae739.tar.gz
Renamed modules utils to util, and errors to exc to be more conforming to the submodules's naming conventions
Diffstat (limited to 'lib/git/index/fun.py')
-rw-r--r--lib/git/index/fun.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/git/index/fun.py b/lib/git/index/fun.py
index cc18c65c..fac559c5 100644
--- a/lib/git/index/fun.py
+++ b/lib/git/index/fun.py
@@ -5,8 +5,8 @@ more versatile
from stat import S_IFDIR
from cStringIO import StringIO
-from git.utils import IndexFileSHA1Writer
-from git.errors import UnmergedEntriesError
+from git.util import IndexFileSHA1Writer
+from git.exc import UnmergedEntriesError
from git.objects.fun import (
tree_to_stream,
traverse_tree_recursive,