diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-07-08 21:17:56 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-07-08 21:17:56 +0200 |
| commit | cd85ce6040485ba3258555e33ae1641ca62097ff (patch) | |
| tree | dad64aeb6cea93a734f870393cce18954024b491 /src/xdiff/xhistogram.c | |
| parent | 286befeb96857ae56c918f425c3165c62ae0d9fb (diff) | |
| parent | 234ca40a89fe1b2181ef56300f1f1261b5cb2836 (diff) | |
| download | libgit2-cd85ce6040485ba3258555e33ae1641ca62097ff.tar.gz | |
Merge pull request #3299 from ethomson/xdiff_update
Don't add unnecessary trailing newline during file merge
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); |