Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-status.out @ 3831:531c116b2028
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 |
comparison
equal
deleted
inserted
replaced
3829:676b75547d13 | 3831:531c116b2028 |
---|---|
116 | 116 |
117 Show status of files in the repository. If names are given, only | 117 Show status of files in the repository. If names are given, only |
118 files that match are shown. Files that are clean or ignored, are | 118 files that match are shown. Files that are clean or ignored, are |
119 not listed unless -c (clean), -i (ignored) or -A is given. | 119 not listed unless -c (clean), -i (ignored) or -A is given. |
120 | 120 |
121 NOTE: status may appear to disagree with diff if permissions have | |
122 changed or a merge has occurred. The standard diff format does not | |
123 report permission changes and diff only reports changes relative | |
124 to one merge parent. | |
125 | |
121 If one revision is given, it is used as the base revision. | 126 If one revision is given, it is used as the base revision. |
122 If two revisions are given, the difference between them is shown. | 127 If two revisions are given, the difference between them is shown. |
123 | 128 |
124 The codes used to show the status of files are: | 129 The codes used to show the status of files are: |
125 M = modified | 130 M = modified |