test-extdiff.out
71 lines
| 1.7 KiB
| text/plain
|
TextLexer
/ tests / test-extdiff.out
Vadim Gelfer
|
r2906 | adding a | ||
Brad Schick
|
r5137 | adding b | ||
Thomas Arendsen Hein
|
r3751 | Only in a: a | ||
Brad Schick
|
r5137 | Only in a: b | ||
Vadim Gelfer
|
r2906 | diffing a.000000000000 a | ||
Thomas Arendsen Hein
|
r4730 | hg falabala [OPTION]... [FILE]... | ||
Vadim Gelfer
|
r2906 | |||
use 'echo' to diff repository (or selected files) | ||||
Show differences between revisions for the specified | ||||
files, using the 'echo' program. | ||||
When two revision arguments are given, then changes are | ||||
shown between those revisions. If only one revision is | ||||
specified then that revision is compared to the working | ||||
directory, and, when no revisions are specified, the | ||||
working directory files are compared to its parent. | ||||
options: | ||||
-o --option pass option to comparison program | ||||
-r --rev revision | ||||
Gilles Moris
|
r7758 | -c --change change made by revision | ||
Vadim Gelfer
|
r2906 | -I --include include names matching the given patterns | ||
-X --exclude exclude names matching the given patterns | ||||
Alexis S. L. Carvalho
|
r4315 | |||
use "hg -v help falabala" to show global options | ||||
Brad Schick
|
r5137 | diffing a.8a5febb7f867/a a.34eed99112ab/a | ||
Benoit Boissinot
|
r3330 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
Dirkjan Ochtman
|
r6336 | created new head | ||
Benoit Boissinot
|
r3330 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
Gilles Moris
|
r7758 | diffing a.2a13a4d2da36/a [tmp]/test-extdiff/a/a | ||
diffing a.8a5febb7f867/a a.34eed99112ab/a | ||||
diffing a.2a13a4d2da36/a a.46c0e4daeb72/a | ||||
Thomas Arendsen Hein
|
r2912 | diff-like tools yield a non-zero exit code | ||
Patrick Mezard
|
r8065 | |||
% test extdiff of multiple files in tmp dir: | ||||
% diff in working directory, before | ||||
diff --git a/a b/a | ||||
--- a/a | ||||
+++ b/a | ||||
@@ -1,1 +1,1 @@ | ||||
-a | ||||
+changed | ||||
diff --git a/b b/b | ||||
old mode 100644 | ||||
new mode 100755 | ||||
--- a/b | ||||
+++ b/b | ||||
@@ -1,1 +1,1 @@ | ||||
-b | ||||
+changed | ||||
% edit with extdiff -p | ||||
% diff in working directory, after | ||||
diff --git a/a b/a | ||||
--- a/a | ||||
+++ b/a | ||||
@@ -1,1 +1,2 @@ | ||||
-a | ||||
+changed | ||||
+edited | ||||
diff --git a/b b/b | ||||
old mode 100644 | ||||
new mode 100755 | ||||
--- a/b | ||||
+++ b/b | ||||
@@ -1,1 +1,2 @@ | ||||
-b | ||||
+changed | ||||
+edited | ||||