diff -r 79d7d715f3d0 -r b62000a28812 mercurial/patch.py --- a/mercurial/patch.py Fri Jul 06 21:38:33 2018 +0900 +++ b/mercurial/patch.py Fri Jul 06 21:41:36 2018 +0900 @@ -2233,7 +2233,7 @@ class GitDiffRequired(Exception): pass -diffopts = diffutil.diffopts +diffopts = diffutil.diffallopts diffallopts = diffutil.diffallopts difffeatureopts = diffutil.difffeatureopts