# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1416940272 -7200
# Node ID 107b566e7a1254a126f2060e24ea1678a84b8d5b
# Parent  fdd6045a5563dbc88508e1abebcd0c9def078a72
Show diff against 2 parents or base during merge.

diff -r fdd6045a5563 -r 107b566e7a12 hg.rst
--- 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.
 ============================