diff -r c1ceec0c8cb4 -r e4d35aa9056c mercurial/context.py
--- a/mercurial/context.py	Wed Aug 14 13:10:27 2013 -0500
+++ b/mercurial/context.py	Tue Apr 29 16:43:59 2014 -0500
@@ -256,8 +256,7 @@
         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)
+        return patch.diff(self._repo, ctx2, self, match=match, opts=diffopts)
 
     @propertycache
     def _dirs(self):