Mercurial Mercurial > tips / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Show diff against 2 parents or base during merge.
authorOleksandr Gavenko <gavenkoa@gmail.com>
Tue, 25 Nov 2014 20:31:12 +0200
changeset 1647 107b566e7a12
parent 1646 fdd6045a5563
child 1648 b911a74c6e52
Show diff against 2 parents or base during merge.
hg.rst file | annotate | diff | comparison | revisions 
--- a/hg.rst	Tue Nov 25 19:25:39 2014 +0200
+++ b/hg.rst	Tue Nov 25 20:31:12 2014 +0200
@@ -73,6 +73,14 @@
   ; Enable '.hgeol' tracking (fix for CR/LF).
   hgext.eol =
 
+Show diff against 2 parents or base during merge.
+=================================================
+::
+
+  hg diff -r 'p1()'
+  hg diff -r 'p2()'
+  hg diff -r 'ancestor(p1(), p2())'
+
 Downgrade repository format.
 ============================
tips