author | Yuya Nishihara <yuya@tcha.org> |
Fri, 06 Jul 2018 21:28:02 +0900 | |
changeset 38582 | 7f4bf8110150 |
parent 38581 | 6467286b829c |
child 38583 | 4bc96c755c17 |
--- 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)