changeset 32202 | ded48ad55146 |
parent 32201 | 4462a981e8df |
child 32369 | 3b88a7fa97d8 |
32201:4462a981e8df | 32202:ded48ad55146 |
---|---|
18 mpatch, |
18 mpatch, |
19 pycompat, |
19 pycompat, |
20 util, |
20 util, |
21 ) |
21 ) |
22 |
22 |
23 blocks = bdiff.blocks |
|
24 fixws = bdiff.fixws |
|
23 patches = mpatch.patches |
25 patches = mpatch.patches |
24 patchedsize = mpatch.patchedsize |
26 patchedsize = mpatch.patchedsize |
25 textdiff = bdiff.bdiff |
27 textdiff = bdiff.bdiff |
26 |
28 |
27 def splitnewlines(text): |
29 def splitnewlines(text): |