Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-extdiff.out @ 5344:cc34be74eeec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable.
author Bryan O'Sullivan <bos@serpentine.com>
date Sat, 29 Sep 2007 21:10:54 -0700
parents 2be225ea5722
children
comparison
equal deleted inserted replaced
5343:26692d08c2f9 5344:cc34be74eeec
1 adding a 1 adding a
2 making snapshot of 0 files from rev 000000000000 2 adding b
3 making snapshot of 1 files from working dir
4 Only in a: a 3 Only in a: a
5 making snapshot of 0 files from rev 000000000000 4 Only in a: b
6 making snapshot of 1 files from working dir
7 diffing a.000000000000 a 5 diffing a.000000000000 a
8 hg falabala [OPTION]... [FILE]... 6 hg falabala [OPTION]... [FILE]...
9 7
10 use 'echo' to diff repository (or selected files) 8 use 'echo' to diff repository (or selected files)
11 9
24 -r --rev revision 22 -r --rev revision
25 -I --include include names matching the given patterns 23 -I --include include names matching the given patterns
26 -X --exclude exclude names matching the given patterns 24 -X --exclude exclude names matching the given patterns
27 25
28 use "hg -v help falabala" to show global options 26 use "hg -v help falabala" to show global options
29 making snapshot of 1 files from rev e27a2475d60a 27 diffing a.8a5febb7f867/a a.34eed99112ab/a
30 making snapshot of 1 files from rev 5e49ec8d3f05
31 diffing a.e27a2475d60a a.5e49ec8d3f05
32 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
33 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 29 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
34 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 30 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
35 (branch merge, don't forget to commit) 31 (branch merge, don't forget to commit)
36 making snapshot of 1 files from rev 5e49ec8d3f05
37 making snapshot of 1 files from working dir
38 diffing a.5e49ec8d3f05 a
39 diff-like tools yield a non-zero exit code 32 diff-like tools yield a non-zero exit code
33 diffing a.34eed99112ab/c [tmp]/test-extdiff/a/c