diff options
author | Sebastian Thiel <byronimo@gmail.com> | 2010-06-22 12:03:53 +0200 |
---|---|---|
committer | Sebastian Thiel <byronimo@gmail.com> | 2010-06-22 12:03:53 +0200 |
commit | 778234d544b3f58dd415aaf10679d15b01a5281f (patch) | |
tree | 57e86ae1ca34f7e3e658b1f078f705ba1b397c10 /lib/git/diff.py | |
parent | 91725f0fc59aa05ef68ab96e9b29009ce84668a5 (diff) | |
parent | c4f49fb232acb2c02761a82acc12c4040699685d (diff) | |
download | gitpython-778234d544b3f58dd415aaf10679d15b01a5281f.tar.gz |
Merge branch 'writetree'
Diffstat (limited to 'lib/git/diff.py')
-rw-r--r-- | lib/git/diff.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/git/diff.py b/lib/git/diff.py index 9df0c499..f9a0a66f 100644 --- a/lib/git/diff.py +++ b/lib/git/diff.py @@ -196,7 +196,7 @@ class Diff(object): \.\.(?P<b_blob_id>[0-9A-Fa-f]+)[ ]?(?P<b_mode>.+)?(?:\n|$))? """, re.VERBOSE | re.MULTILINE) # can be used for comparisons - null_hex_sha = "0"*40 + NULL_HEX_SHA = "0"*40 __slots__ = ("a_blob", "b_blob", "a_mode", "b_mode", "new_file", "deleted_file", "rename_from", "rename_to", "diff") |