changeset 30023 | ff17dff99295 |
parent 29939 | 80be4436e4cc |
child 30040 | 3e3f2201bbdf |
--- a/mercurial/context.py Mon Sep 26 23:28:57 2016 +0900 +++ b/mercurial/context.py Tue Sep 27 14:46:34 2016 +0200 @@ -940,8 +940,7 @@ return ([(rev, False)] * lines(text), text) def pair(parent, child): - blocks = mdiff.allblocks(parent[1], child[1], opts=diffopts, - refine=True) + blocks = mdiff.allblocks(parent[1], child[1], opts=diffopts) for (a1, a2, b1, b2), t in blocks: # Changed blocks ('!') or blocks made only of blank lines ('~') # belong to the child.