From 55dcc17c331f580b3beeb4d5decf64d3baf94f2e Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <byronimo@gmail.com>
Date: Thu, 24 Jun 2010 16:02:28 +0200
Subject: 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

---
 lib/git/diff.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/git/diff.py')

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")
-- 
cgit v1.2.1