diff options
| author | joshaber <joshaber@gmail.com> | 2015-07-22 11:33:18 -0400 |
|---|---|---|
| committer | joshaber <joshaber@gmail.com> | 2015-07-22 11:33:18 -0400 |
| commit | 9830fbba05ef66325f929a09407abc45ab85847d (patch) | |
| tree | dac363428f4705a632719e03b8b77f2d32ce2bb3 /src/xdiff/xhistogram.c | |
| parent | cf198fdf2a044d2e2f0675c2c6b1cd9cdbcf4fcf (diff) | |
| parent | 42156d561723e92ffe597885719aa63abfe0795c (diff) | |
| download | libgit2-fix-init-ordering.tar.gz | |
Merge branch 'master' into fix-init-orderingfix-init-ordering
Diffstat (limited to 'src/xdiff/xhistogram.c')
| -rw-r--r-- | src/xdiff/xhistogram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xdiff/xhistogram.c b/src/xdiff/xhistogram.c index c84812893..500d8112a 100644 --- a/src/xdiff/xhistogram.c +++ b/src/xdiff/xhistogram.c @@ -258,7 +258,7 @@ static int fall_back_to_classic_diff(struct histindex *index, int line1, int count1, int line2, int count2) { xpparam_t xpp; - xpp.flags = index->xpp->flags & ~XDF_HISTOGRAM_DIFF; + xpp.flags = index->xpp->flags & ~XDF_DIFF_ALGORITHM_MASK; return xdl_fall_back_diff(index->env, &xpp, line1, count1, line2, count2); |