# HG changeset patch # User Yuya Nishihara # Date 1530880082 -32400 # Node ID 7f4bf81101507644d92347aaa0d9d9c1043842d1 # Parent 6467286b829c714f391e4a443ced6dfdd2c532a7 context: remove unneeded alias of diffopts diff -r 6467286b829c -r 7f4bf8110150 mercurial/context.py --- a/mercurial/context.py Tue Jun 12 22:01:59 2018 +0900 +++ b/mercurial/context.py Fri Jul 06 21:28:02 2018 +0900 @@ -302,10 +302,8 @@ ctx2 = self.p1() if ctx2 is not None: ctx2 = self._repo[ctx2] - - diffopts = opts return patch.diff(self._repo, ctx2, self, match=match, changes=changes, - opts=diffopts, losedatafn=losedatafn, prefix=prefix, + opts=opts, losedatafn=losedatafn, prefix=prefix, relroot=relroot, copy=copy, hunksfilterfn=hunksfilterfn)