Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-status.out @ 3831:531c116b2028

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add doc notes about revert and hg status vs diff
author Matt Mackall <mpm@selenic.com>
date Fri, 08 Dec 2006 14:55:45 -0600
parents 5155fa27f514
children a7b61c3b0f93
line wrap: on
line diff
--- a/tests/test-status.out
+++ b/tests/test-status.out
@@ -118,6 +118,11 @@ show changed files in the working direct
     files that match are shown.  Files that are clean or ignored, are
     not listed unless -c (clean), -i (ignored) or -A is given.
 
+    NOTE: status may appear to disagree with diff if permissions have
+    changed or a merge has occurred. The standard diff format does not
+    report permission changes and diff only reports changes relative
+    to one merge parent.
+
     If one revision is given, it is used as the base revision.
     If two revisions are given, the difference between them is shown.