equal
deleted
inserted
replaced
497 only ..." are given, the options -mardu are used. |
497 only ..." are given, the options -mardu are used. |
498 |
498 |
499 Option -q/--quiet hides untracked (unknown and ignored) files unless |
499 Option -q/--quiet hides untracked (unknown and ignored) files unless |
500 explicitly requested with -u/--unknown or -i/--ignored. |
500 explicitly requested with -u/--unknown or -i/--ignored. |
501 |
501 |
502 NOTE: status may appear to disagree with diff if permissions have changed |
502 Note: |
503 or a merge has occurred. The standard diff format does not report |
503 status may appear to disagree with diff if permissions have changed or |
504 permission changes and diff only reports changes relative to one merge |
504 a merge has occurred. The standard diff format does not report |
505 parent. |
505 permission changes and diff only reports changes relative to one merge |
|
506 parent. |
506 |
507 |
507 If one revision is given, it is used as the base revision. If two |
508 If one revision is given, it is used as the base revision. If two |
508 revisions are given, the differences between them are shown. The --change |
509 revisions are given, the differences between them are shown. The --change |
509 option can also be used as a shortcut to list the changed files of a |
510 option can also be used as a shortcut to list the changed files of a |
510 revision from its first parent. |
511 revision from its first parent. |