commands: correct diff -c explanation stable
authortimeless <timeless@mozdev.org>
Tue, 23 Feb 2010 06:42:10 +0100
branchstable
changeset 10527 9c0ba837dc65
parent 10526 72d3a02c62e6
child 10528 8ec48ab90f72
child 10529 076e8a8000a3
commands: correct diff -c explanation
mercurial/commands.py
tests/test-help.out
--- a/mercurial/commands.py	Mon Feb 22 23:12:12 2010 -0500
+++ b/mercurial/commands.py	Tue Feb 23 06:42:10 2010 +0100
@@ -1114,8 +1114,8 @@
     revisions are specified, the working directory files are compared
     to its parent.
 
-    Alternatively you can specify -c/--change with a revision to use
-    as a baseline.
+    Alternatively you can specify -c/--change with a revision to see
+    the changes in that changeset relative to its first parent.
 
     Without the -a/--text option, diff will avoid generating diffs of
     files it detects as binary. With -a, diff will generate a diff
--- a/tests/test-help.out	Mon Feb 22 23:12:12 2010 -0500
+++ b/tests/test-help.out	Tue Feb 23 06:42:10 2010 +0100
@@ -383,8 +383,8 @@
     compared to the working directory, and, when no revisions are specified,
     the working directory files are compared to its parent.
 
-    Alternatively you can specify -c/--change with a revision to use as a
-    baseline.
+    Alternatively you can specify -c/--change with a revision to see the
+    changes in that changeset relative to its first parent.
 
     Without the -a/--text option, diff will avoid generating diffs of files it
     detects as binary. With -a, diff will generate a diff anyway, probably