From 55dcc17c331f580b3beeb4d5decf64d3baf94f2e Mon Sep 17 00:00:00 2001 From: Sebastian Thiel 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/ext/gitdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/git/ext/gitdb') diff --git a/lib/git/ext/gitdb b/lib/git/ext/gitdb index 9b53ab02..d3a0037d 160000 --- a/lib/git/ext/gitdb +++ b/lib/git/ext/gitdb @@ -1 +1 @@ -Subproject commit 9b53ab02cb44571e6167a125a5296b7c3395563f +Subproject commit d3a0037dd5a11459985e7dc4b6819f6292f20c13 -- cgit v1.2.1