# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 2015-12-18 18:52:25
# Node ID 5df74b2f296df7f44a08106df4f9dd97a5aa726a
# Parent  f209c85183a72873a9428e2f68b617e56bd09d7f

diff: clarify comparison as first parent

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -3541,7 +3541,7 @@ def diff(ui, repo, *pats, **opts):
     between those revisions. If only one revision is specified then
     that revision is compared to the working directory, and, when no
     revisions are specified, the working directory files are compared
-    to its parent.
+    to its first parent.
 
     Alternatively you can specify -c/--change with a revision to see
     the changes in that changeset relative to its first parent.
diff --git a/tests/test-help.t b/tests/test-help.t
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -505,7 +505,7 @@ Test command without options
       When two revision arguments are given, then changes are shown between
       those revisions. If only one revision is specified then that revision is
       compared to the working directory, and, when no revisions are specified,
-      the working directory files are compared to its parent.
+      the working directory files are compared to its first parent.
   
       Alternatively you can specify -c/--change with a revision to see the
       changes in that changeset relative to its first parent.