tests/test-extdiff.out
changeset 5110 2be225ea5722
parent 5109 841568ccc09d
equal deleted inserted replaced
5109:841568ccc09d 5110:2be225ea5722
     1 adding a
     1 adding a
       
     2 adding b
     2 Only in a: a
     3 Only in a: a
       
     4 Only in a: b
     3 diffing a.000000000000 a
     5 diffing a.000000000000 a
     4 hg falabala [OPTION]... [FILE]...
     6 hg falabala [OPTION]... [FILE]...
     5 
     7 
     6 use 'echo' to diff repository (or selected files)
     8 use 'echo' to diff repository (or selected files)
     7 
     9 
    20  -r --rev      revision
    22  -r --rev      revision
    21  -I --include  include names matching the given patterns
    23  -I --include  include names matching the given patterns
    22  -X --exclude  exclude names matching the given patterns
    24  -X --exclude  exclude names matching the given patterns
    23 
    25 
    24 use "hg -v help falabala" to show global options
    26 use "hg -v help falabala" to show global options
    25 diffing a.e27a2475d60a a.5e49ec8d3f05
    27 diffing a.8a5febb7f867/a a.34eed99112ab/a
    26 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
    27 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
    28 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
    29 (branch merge, don't forget to commit)
    31 (branch merge, don't forget to commit)
    30 diffing a.5e49ec8d3f05 a
       
    31 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