mercurial/commands.py

--- a/mercurial/commands.py	Sat Mar 31 23:38:53 2018 -0700
+++ b/mercurial/commands.py	Sat Mar 31 23:25:02 2018 -0700
@@ -1878,7 +1878,8 @@
         node1 = repo[node2].p1().node()
     else:
         repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
-        node1, node2 = scmutil.revpairnodes(repo, revs)
+        ctx1, ctx2 = scmutil.revpair(repo, revs)
+        node1, node2 = ctx1.node(), ctx2.node()
 
     if reverse:
         node1, node2 = node2, node1