Submitter | Sean Farley |
---|---|
Date | Aug. 7, 2013, 11:51 p.m. |
Message ID | <2b9d9c462478e5d903c8.1375919506@laptop.local> |
Download | mbox | patch |
Permalink | /patch/2085/ |
State | Accepted |
Headers | show |
Comments
Patch
diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -130,11 +130,11 @@ def diff(self, ctx2=None, match=None, **opts): """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(), match=match, opts=diffopts)