Show More
@@ -30,7 +30,6 b' from . import (' | |||
|
30 | 30 | error, |
|
31 | 31 | fileset, |
|
32 | 32 | match as matchmod, |
|
33 | mdiff, | |
|
34 | 33 | obsolete as obsmod, |
|
35 | 34 | patch, |
|
36 | 35 | pathutil, |
@@ -304,10 +303,7 b' class basectx(object):' | |||
|
304 | 303 | if ctx2 is not None: |
|
305 | 304 | ctx2 = self._repo[ctx2] |
|
306 | 305 | |
|
307 | if isinstance(opts, mdiff.diffopts): | |
|
308 | diffopts = opts | |
|
309 | else: | |
|
310 | diffopts = patch.diffopts(self._repo.ui, opts) | |
|
306 | diffopts = opts | |
|
311 | 307 | return patch.diff(self._repo, ctx2, self, match=match, changes=changes, |
|
312 | 308 | opts=diffopts, losedatafn=losedatafn, prefix=prefix, |
|
313 | 309 | relroot=relroot, copy=copy, |
General Comments 0
You need to be logged in to leave comments.
Login now