Mercurial > hg

comparison tests/test-help.out @ 8033:aeb4a5c7a28e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: consistently write switches as -a/--abc
author Martin Geisler <mg@lazybytes.net>
date Wed, 08 Apr 2009 21:20:31 +0200
parents 683d8ebcf434
children 545fb915fe16
comparison
equal deleted inserted replaced
8032:4726a522a182 8033:aeb4a5c7a28e
215 between those revisions. If only one revision is specified then 215 between those revisions. If only one revision is specified then
216 that revision is compared to the working directory, and, when no 216 that revision is compared to the working directory, and, when no
217 revisions are specified, the working directory files are compared 217 revisions are specified, the working directory files are compared
218 to its parent. 218 to its parent.
219 219
220 Without the -a option, diff will avoid generating diffs of files 220 Without the -a/--text option, diff will avoid generating diffs of
221 it detects as binary. With -a, diff will generate a diff anyway, 221 files it detects as binary. With -a, diff will generate a diff
222 probably with undesirable results. 222 anyway, probably with undesirable results.
223 223
224 Use the --git option to generate diffs in the git extended diff 224 Use the -g/--git option to generate diffs in the git extended diff
225 format. For more information, read 'hg help diffs'. 225 format. For more information, read 'hg help diffs'.
226 226
227 options: 227 options:
228 228
229 -r --rev revision 229 -r --rev revision
246 246
247 show changed files in the working directory 247 show changed files in the working directory
248 248
249 Show status of files in the repository. If names are given, only 249 Show status of files in the repository. If names are given, only
250 files that match are shown. Files that are clean or ignored or 250 files that match are shown. Files that are clean or ignored or
251 source of a copy/move operation, are not listed unless -c (clean), 251 source of a copy/move operation, are not listed unless -c/--clean,
252 -i (ignored), -C (copies) or -A is given. Unless options described 252 -i/--ignored, -C/--copies or -A/--all is given. Unless options
253 with "show only ..." are given, the options -mardu are used. 253 described with "show only ..." are given, the options -mardu are
254 used.
254 255
255 Option -q/--quiet hides untracked (unknown and ignored) files 256 Option -q/--quiet hides untracked (unknown and ignored) files
256 unless explicitly requested with -u/--unknown or -i/--ignored. 257 unless explicitly requested with -u/--unknown or -i/--ignored.
257 258
258 NOTE: status may appear to disagree with diff if permissions have 259 NOTE: status may appear to disagree with diff if permissions have