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/ext/gitdb | |
| 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/ext/gitdb')
| m--------- | lib/git/ext/gitdb | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/lib/git/ext/gitdb b/lib/git/ext/gitdb -Subproject 9b53ab02cb44571e6167a125a5296b7c3395563 +Subproject d3a0037dd5a11459985e7dc4b6819f6292f20c1 |