changeset 19568 | f58235d85d6b |
parent 19567 | 49b128e50e84 |
child 19571 | 103edf3ed79e |
--- a/mercurial/context.py Mon Aug 05 18:42:41 2013 -0500 +++ b/mercurial/context.py Tue Aug 06 15:11:31 2013 -0500 @@ -132,7 +132,7 @@ """Returns a diff generator for the given contexts and matcher""" if ctx2 is None: ctx2 = self.p1() - if ctx2 is not None and not isinstance(ctx2, changectx): + if ctx2 is not None: ctx2 = self._repo[ctx2] diffopts = patch.diffopts(self._repo.ui, opts) return patch.diff(self._repo, ctx2.node(), self.node(),