summaryrefslogtreecommitdiff
path: root/lib/git/diff.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2010-07-01 17:58:19 +0200
committerSebastian Thiel <byronimo@gmail.com>2010-07-01 17:58:19 +0200
commitfd96cceded27d1372bdc1a851448d2d8613f60f3 (patch)
tree5b53f288a3379e260f46a65d08691fceec4a0ca3 /lib/git/diff.py
parent6917ae4ce9eaa0f5ea91592988c1ea830626ac3a (diff)
parentc3bd05b426a0e3dec8224244c3c9c0431d1ff130 (diff)
downloadgitpython-fd96cceded27d1372bdc1a851448d2d8613f60f3.tar.gz
Merge branch 'docs'
Diffstat (limited to 'lib/git/diff.py')
-rw-r--r--lib/git/diff.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/git/diff.py b/lib/git/diff.py
index 79a0c3c1..788bf238 100644
--- a/lib/git/diff.py
+++ b/lib/git/diff.py
@@ -6,8 +6,8 @@
import re
from objects.blob import Blob
-from objects.utils import mode_str_to_int
-from errors import GitCommandError
+from objects.util import mode_str_to_int
+from exc import GitCommandError
from gitdb.util import hex_to_bin