Mercurial > hg-stable

comparison tests/test-extdiff.t @ 23048:ee5f834077be stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default into stable for 3.2 freeze
author Matt Mackall <mpm@selenic.com>
date Sat, 18 Oct 2014 18:04:31 -0500
parents c1d93edcf004
children 72a89cf86fcd aff73c777b0b
comparison
equal deleted inserted replaced
22843:b6531d806de8 23048:ee5f834077be
35 When two revision arguments are given, then changes are shown between 35 When two revision arguments are given, then changes are shown between
36 those revisions. If only one revision is specified then that revision is 36 those revisions. If only one revision is specified then that revision is
37 compared to the working directory, and, when no revisions are specified, 37 compared to the working directory, and, when no revisions are specified,
38 the working directory files are compared to its parent. 38 the working directory files are compared to its parent.
39 39
40 options: 40 options ([+] can be repeated):
41 41
42 -o --option OPT [+] pass option to comparison program 42 -o --option OPT [+] pass option to comparison program
43 -r --rev REV [+] revision 43 -r --rev REV [+] revision
44 -c --change REV change made by revision 44 -c --change REV change made by revision
45 -I --include PATTERN [+] include names matching the given patterns 45 -I --include PATTERN [+] include names matching the given patterns
46 -X --exclude PATTERN [+] exclude names matching the given patterns 46 -X --exclude PATTERN [+] exclude names matching the given patterns
47 47
48 [+] marked option can be specified multiple times 48 (some details hidden, use --verbose to show complete help)
49
50 use "hg -v help falabala" to show the global options
51 49
52 $ hg ci -d '0 0' -mtest1 50 $ hg ci -d '0 0' -mtest1
53 51
54 $ echo b >> a 52 $ echo b >> a
55 $ hg ci -d '1 0' -mtest2 53 $ hg ci -d '1 0' -mtest2