Mercurial > hg
comparison tests/test-extdiff.out @ 7758:e81e6c996e99
extdiff: add --change option to display single changeset diff
This is the counterpart for extdiff of 9c6ae2e09e11.
author | Gilles Moris <gilles.moris@free.fr> |
---|---|
date | Sat, 07 Feb 2009 19:41:05 +0100 |
parents | 4b0c9c674707 |
children | 66d0a03d3afc |
comparison
equal
deleted
inserted
replaced
7757:af6a63438a8a | 7758:e81e6c996e99 |
---|---|
18 | 18 |
19 options: | 19 options: |
20 | 20 |
21 -o --option pass option to comparison program | 21 -o --option pass option to comparison program |
22 -r --rev revision | 22 -r --rev revision |
23 -c --change change made by revision | |
23 -I --include include names matching the given patterns | 24 -I --include include names matching the given patterns |
24 -X --exclude exclude names matching the given patterns | 25 -X --exclude exclude names matching the given patterns |
25 | 26 |
26 use "hg -v help falabala" to show global options | 27 use "hg -v help falabala" to show global options |
27 diffing a.8a5febb7f867/a a.34eed99112ab/a | 28 diffing a.8a5febb7f867/a a.34eed99112ab/a |
28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 29 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
29 created new head | 30 created new head |
30 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
31 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 31 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
32 (branch merge, don't forget to commit) | 32 (branch merge, don't forget to commit) |
33 diffing a.2a13a4d2da36/a [tmp]/test-extdiff/a/a | |
34 diffing a.8a5febb7f867/a a.34eed99112ab/a | |
35 diffing a.2a13a4d2da36/a a.46c0e4daeb72/a | |
33 diff-like tools yield a non-zero exit code | 36 diff-like tools yield a non-zero exit code |
34 diffing a.34eed99112ab/c [tmp]/test-extdiff/a/c |