diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-06-24 16:02:28 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-06-24 18:08:40 +0200 |
| commit | 55dcc17c331f580b3beeb4d5decf64d3baf94f2e (patch) | |
| tree | 9b22eac76156f87e307ea33294791bc820fd3167 /lib/git/diff.py | |
| parent | 129f90aa8d83d9b250c87b0ba790605c4a2bb06a (diff) | |
| download | gitpython-55dcc17c331f580b3beeb4d5decf64d3baf94f2e.tar.gz | |
aggressive_tree_merge: fixed incorrect handling of one branch, it was just not implemented causing incorrect merge results. Added test to cover this issue
Diff: added NULL_BIN_SHA constant for completeness
Diffstat (limited to 'lib/git/diff.py')
| -rw-r--r-- | lib/git/diff.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/git/diff.py b/lib/git/diff.py index f9a0a66f..36b216e3 100644 --- a/lib/git/diff.py +++ b/lib/git/diff.py @@ -197,6 +197,7 @@ class Diff(object): """, re.VERBOSE | re.MULTILINE) # can be used for comparisons NULL_HEX_SHA = "0"*40 + NULL_BIN_SHA = "\0"*20 __slots__ = ("a_blob", "b_blob", "a_mode", "b_mode", "new_file", "deleted_file", "rename_from", "rename_to", "diff") |