| changeset 50586 | 362d5a2ffd17 |
| parent 49897 | a78dfb1ad60e |
| child 50911 | e586a7eb380a |
| 50585:0ec94359eae8 | 50586:362d5a2ffd17 |
|---|---|
211 |
211 |
212 def chooseblocksfunc(opts=None): |
212 def chooseblocksfunc(opts=None): |
213 if ( |
213 if ( |
214 opts is None |
214 opts is None |
215 or not opts.xdiff |
215 or not opts.xdiff |
216 or not util.safehasattr(bdiff, b'xdiffblocks') |
216 or not util.safehasattr(bdiff, 'xdiffblocks') |
217 ): |
217 ): |
218 return bdiff.blocks |
218 return bdiff.blocks |
219 else: |
219 else: |
220 return bdiff.xdiffblocks |
220 return bdiff.xdiffblocks |
221 |
221 |