diff -r 7a8ea1397816 -r d718eddf01d9 mercurial/mdiff.py --- a/mercurial/mdiff.py Thu Dec 08 15:33:19 2022 +0100 +++ b/mercurial/mdiff.py Thu Aug 31 23:56:15 2023 +0200 @@ -211,11 +211,7 @@ def chooseblocksfunc(opts=None): - if ( - opts is None - or not opts.xdiff - or not util.safehasattr(bdiff, 'xdiffblocks') - ): + if opts is None or not opts.xdiff or not hasattr(bdiff, 'xdiffblocks'): return bdiff.blocks else: return bdiff.xdiffblocks