Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/cmdutil.py
changeset 21579 87a972b5c039
parent 21578 7cfe51661e98
child 21689 503bb3af70fe 
--- a/mercurial/cmdutil.py	Wed May 14 10:37:25 2014 -0700
+++ b/mercurial/cmdutil.py	Wed May 14 10:38:05 2014 -0700
@@ -2250,6 +2250,8 @@
     node = ctx.node()
 
     mf = ctx.manifest()
+    if node == p2:
+        parent = p2
     if node == parent:
         pmf = mf
     else:
Mercurial