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/diff.py | |
| parent | a98e0af511b728030c12bf8633b077866bb74e47 (diff) | |
| parent | f6897c78be5a5530129df50742cb6cabfb8609c9 (diff) | |
| download | GitPython-58a930a632c867b65b9a3802e2f4190cf32e33ee.tar.gz GitPython-58a930a632c867b65b9a3802e2f4190cf32e33ee.zip | |
Merge branch 'gitdbmerger'
Diffstat (limited to 'git/diff.py')
| -rw-r--r-- | git/diff.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git/diff.py b/git/diff.py index 7b3bf6b5..d1c6c0ac 100644 --- a/git/diff.py +++ b/git/diff.py @@ -9,7 +9,7 @@ from objects.blob import Blob from objects.util import mode_str_to_int from exc import GitCommandError -from gitdb.util import hex_to_bin +from git.util import hex_to_bin __all__ = ('Diffable', 'DiffIndex', 'Diff') |