Mercurial > hg-stable

changeset 27452:5df74b2f296d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diff: clarify comparison as first parent
author timeless <timeless@mozdev.org>
date Fri, 18 Dec 2015 18:52:25 +0000
parents f209c85183a7
children 8462d7f2c4fe
files mercurial/commands.py tests/test-help.t
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Dec 18 06:19:22 2015 +0000
+++ b/mercurial/commands.py	Fri Dec 18 18:52:25 2015 +0000
@@ -3541,7 +3541,7 @@
     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.
--- a/tests/test-help.t	Fri Dec 18 06:19:22 2015 +0000
+++ b/tests/test-help.t	Fri Dec 18 18:52:25 2015 +0000
@@ -505,7 +505,7 @@
       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.