| commit | 60f32f6193665c42a078372004b9828afd5f03da | [log] [tgz] |
|---|---|---|
| author | Dave Borowitz <dborowitz@google.com> | Fri Jun 13 11:37:51 2014 -0700 |
| committer | Dave Borowitz <dborowitz@google.com> | Fri Jun 13 11:37:51 2014 -0700 |
| tree | a842733c1e2a4876ddb6900eb54a4b58f25278dc | |
| parent | 8392d06ceda0ad1470bd28f359f1b2c54bafaf9a [diff] |
Return false from MergeUtil.canMerge on LargeObjectException JGit's merge code depends on ObjectLoader.getCachedBytes(), which may throw LargeObjectException, in which case it can't attempt a content merge. For non-content merges (no difference from one parent), we should not hit this case. Change-Id: I8c4c42d8cd2234e6d3b8e38d9c08b8b89e82e37b