Mercurial > hg

comparison tests/test-mq-qdiff.out @ 6668:034f444902d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: qdiff: support all diffopts
author Jason Orendorff <jorendorff@mozilla.com>
date Thu, 12 Jun 2008 07:38:15 -0500
parents 3d1f9dcecdea
children fb32ae9c76e7
comparison
equal deleted inserted replaced
6667:01e95d4bc66c 6668:034f444902d9
15 --- a/base 15 --- a/base
16 +++ b/base 16 +++ b/base
17 @@ -1,1 +1,1 @@ 17 @@ -1,1 +1,1 @@
18 -base 18 -base
19 +patched 19 +patched
20 % qdiff filename
21 diff -r 67e992f2c4f3 base
22 --- a/base
23 +++ b/base
24 @@ -1,1 +1,1 @@
25 -base
26 +patched
27 % revert
28 % qpop
29 Patch queue now empty
30 % qdelete mqbase
31 % commit 2
32 adding lines
33 % qnew 2
34 % qdiff -U 1
35 diff -r 35fb829491c1 lines
36 --- a/lines
37 +++ b/lines
38 @@ -1,1 +1,3 @@
39 +
40 +
41 1
42 @@ -4,4 +6,4 @@
43 4
44 -hello world
45 -goodbye world
46 +hello world
47 + goodbye world
48 7
49 % qdiff -b
50 diff -r 35fb829491c1 lines
51 --- a/lines
52 +++ b/lines
53 @@ -1,9 +1,11 @@
54 +
55 +
56 1
57 2
58 3
59 4
60 -hello world
61 -goodbye world
62 +hello world
63 + goodbye world
64 7
65 8
66 9
67 % qdiff -U 1 -B
68 diff -r 35fb829491c1 lines
69 --- a/lines
70 +++ b/lines
71 @@ -4,4 +6,4 @@
72 4
73 -hello world
74 -goodbye world
75 +hello world
76 + goodbye world
77 7
78 qdiff -w
79 diff -r 35fb829491c1 lines
80 --- a/lines
81 +++ b/lines
82 @@ -1,3 +1,5 @@
83 +
84 +
85 1
86 2
87 3