1 adding foo |
|
2 >>> two diffs showing three added lines <<< |
|
3 hg diff |
|
4 diff -r 540c40a65b78 foo |
|
5 --- a/foo |
|
6 +++ b/foo |
|
7 @@ -1,2 +1,5 @@ |
|
8 + |
|
9 hello world |
|
10 + |
|
11 goodbye world |
|
12 + |
|
13 hg diff -b |
|
14 diff -r 540c40a65b78 foo |
|
15 --- a/foo |
|
16 +++ b/foo |
|
17 @@ -1,2 +1,5 @@ |
|
18 + |
|
19 hello world |
|
20 + |
|
21 goodbye world |
|
22 + |
|
23 >>> no diffs <<< |
|
24 hg diff -B |
|
25 hg diff -Bb |
|
26 >>> four diffs showing added space first on the first line <<< |
|
27 hg diff |
|
28 diff -r 540c40a65b78 foo |
|
29 --- a/foo |
|
30 +++ b/foo |
|
31 @@ -1,2 +1,2 @@ |
|
32 -hello world |
|
33 + hello world |
|
34 goodbye world |
|
35 hg diff -b |
|
36 diff -r 540c40a65b78 foo |
|
37 --- a/foo |
|
38 +++ b/foo |
|
39 @@ -1,2 +1,2 @@ |
|
40 -hello world |
|
41 + hello world |
|
42 goodbye world |
|
43 hg diff -B |
|
44 diff -r 540c40a65b78 foo |
|
45 --- a/foo |
|
46 +++ b/foo |
|
47 @@ -1,2 +1,2 @@ |
|
48 -hello world |
|
49 + hello world |
|
50 goodbye world |
|
51 hg diff -Bb |
|
52 diff -r 540c40a65b78 foo |
|
53 --- a/foo |
|
54 +++ b/foo |
|
55 @@ -1,2 +1,2 @@ |
|
56 -hello world |
|
57 + hello world |
|
58 goodbye world |
|
59 >>> two diffs showing space appended to the first line <<< |
|
60 hg diff |
|
61 diff -r 540c40a65b78 foo |
|
62 --- a/foo |
|
63 +++ b/foo |
|
64 @@ -1,2 +1,2 @@ |
|
65 -hello world |
|
66 +hello world |
|
67 goodbye world |
|
68 hg diff -B |
|
69 diff -r 540c40a65b78 foo |
|
70 --- a/foo |
|
71 +++ b/foo |
|
72 @@ -1,2 +1,2 @@ |
|
73 -hello world |
|
74 +hello world |
|
75 goodbye world |
|
76 >>> no diffs <<< |
|
77 hg diff -b |
|
78 hg diff -Bb |
|
79 >>> four diffs showing space inserted into "goodbye" <<< |
|
80 hg diff |
|
81 diff -r 540c40a65b78 foo |
|
82 --- a/foo |
|
83 +++ b/foo |
|
84 @@ -1,2 +1,2 @@ |
|
85 hello world |
|
86 -goodbye world |
|
87 +good bye world |
|
88 hg diff -B |
|
89 diff -r 540c40a65b78 foo |
|
90 --- a/foo |
|
91 +++ b/foo |
|
92 @@ -1,2 +1,2 @@ |
|
93 hello world |
|
94 -goodbye world |
|
95 +good bye world |
|
96 hg diff -b |
|
97 diff -r 540c40a65b78 foo |
|
98 --- a/foo |
|
99 +++ b/foo |
|
100 @@ -1,2 +1,2 @@ |
|
101 hello world |
|
102 -goodbye world |
|
103 +good bye world |
|
104 hg diff -Bb |
|
105 diff -r 540c40a65b78 foo |
|
106 --- a/foo |
|
107 +++ b/foo |
|
108 @@ -1,2 +1,2 @@ |
|
109 hello world |
|
110 -goodbye world |
|
111 +good bye world |
|
112 >>> two diffs showing changed whitespace amount in the last line <<< |
|
113 hg diff |
|
114 diff -r 540c40a65b78 foo |
|
115 --- a/foo |
|
116 +++ b/foo |
|
117 @@ -1,2 +1,2 @@ |
|
118 hello world |
|
119 -goodbye world |
|
120 +goodbye world |
|
121 hg diff -B |
|
122 diff -r 540c40a65b78 foo |
|
123 --- a/foo |
|
124 +++ b/foo |
|
125 @@ -1,2 +1,2 @@ |
|
126 hello world |
|
127 -goodbye world |
|
128 +goodbye world |
|
129 >>> no diffs <<< |
|
130 hg diff -b |
|
131 hg diff -Bb |
|
132 >>> four diffs showing added blank line w/horizontal space <<< |
|
133 hg diff |
|
134 diff -r 540c40a65b78 foo |
|
135 --- a/foo |
|
136 +++ b/foo |
|
137 @@ -1,2 +1,3 @@ |
|
138 hello world |
|
139 + |
|
140 goodbye world |
|
141 hg diff -B |
|
142 diff -r 540c40a65b78 foo |
|
143 --- a/foo |
|
144 +++ b/foo |
|
145 @@ -1,2 +1,3 @@ |
|
146 hello world |
|
147 + |
|
148 goodbye world |
|
149 hg diff -b |
|
150 diff -r 540c40a65b78 foo |
|
151 --- a/foo |
|
152 +++ b/foo |
|
153 @@ -1,2 +1,3 @@ |
|
154 hello world |
|
155 + |
|
156 goodbye world |
|
157 hg diff -Bb |
|
158 >>> three diffs showing added blank line w/other space <<< |
|
159 hg diff |
|
160 diff -r 540c40a65b78 foo |
|
161 --- a/foo |
|
162 +++ b/foo |
|
163 @@ -1,2 +1,3 @@ |
|
164 -hello world |
|
165 -goodbye world |
|
166 +hello world |
|
167 + |
|
168 +goodbye world |
|
169 hg diff -B |
|
170 diff -r 540c40a65b78 foo |
|
171 --- a/foo |
|
172 +++ b/foo |
|
173 @@ -1,2 +1,3 @@ |
|
174 -hello world |
|
175 -goodbye world |
|
176 +hello world |
|
177 + |
|
178 +goodbye world |
|
179 hg diff -b |
|
180 diff -r 540c40a65b78 foo |
|
181 --- a/foo |
|
182 +++ b/foo |
|
183 @@ -1,2 +1,3 @@ |
|
184 hello world |
|
185 + |
|
186 goodbye world |
|
187 hg diff -Bb |
|
188 >>> four diffs showing changed whitespace <<< |
|
189 hg diff |
|
190 diff -r 540c40a65b78 foo |
|
191 --- a/foo |
|
192 +++ b/foo |
|
193 @@ -1,2 +1,2 @@ |
|
194 -hello world |
|
195 -goodbye world |
|
196 +helloworld |
|
197 +goodbye world |
|
198 hg diff -B |
|
199 diff -r 540c40a65b78 foo |
|
200 --- a/foo |
|
201 +++ b/foo |
|
202 @@ -1,2 +1,2 @@ |
|
203 -hello world |
|
204 -goodbye world |
|
205 +helloworld |
|
206 +goodbye world |
|
207 hg diff -b |
|
208 diff -r 540c40a65b78 foo |
|
209 --- a/foo |
|
210 +++ b/foo |
|
211 @@ -1,2 +1,2 @@ |
|
212 -hello world |
|
213 +helloworld |
|
214 goodbye world |
|
215 hg diff -Bb |
|
216 diff -r 540c40a65b78 foo |
|
217 --- a/foo |
|
218 +++ b/foo |
|
219 @@ -1,2 +1,2 @@ |
|
220 -hello world |
|
221 +helloworld |
|
222 goodbye world |
|
223 hg diff -w |
|
224 >>> five diffs showing changed whitespace <<< |
|
225 hg diff |
|
226 diff -r 540c40a65b78 foo |
|
227 --- a/foo |
|
228 +++ b/foo |
|
229 @@ -1,2 +1,5 @@ |
|
230 -hello world |
|
231 -goodbye world |
|
232 +helloworld |
|
233 + |
|
234 + |
|
235 + |
|
236 +goodbye world |
|
237 hg diff -B |
|
238 diff -r 540c40a65b78 foo |
|
239 --- a/foo |
|
240 +++ b/foo |
|
241 @@ -1,2 +1,5 @@ |
|
242 -hello world |
|
243 -goodbye world |
|
244 +helloworld |
|
245 + |
|
246 + |
|
247 + |
|
248 +goodbye world |
|
249 hg diff -b |
|
250 diff -r 540c40a65b78 foo |
|
251 --- a/foo |
|
252 +++ b/foo |
|
253 @@ -1,2 +1,5 @@ |
|
254 -hello world |
|
255 +helloworld |
|
256 + |
|
257 + |
|
258 + |
|
259 goodbye world |
|
260 hg diff -Bb |
|
261 diff -r 540c40a65b78 foo |
|
262 --- a/foo |
|
263 +++ b/foo |
|
264 @@ -1,2 +1,5 @@ |
|
265 -hello world |
|
266 +helloworld |
|
267 + |
|
268 + |
|
269 + |
|
270 goodbye world |
|
271 hg diff -w |
|
272 diff -r 540c40a65b78 foo |
|
273 --- a/foo |
|
274 +++ b/foo |
|
275 @@ -1,2 +1,5 @@ |
|
276 hello world |
|
277 + |
|
278 + |
|
279 + |
|
280 goodbye world |
|
281 hg diff -wB |
|