equal
deleted
inserted
replaced
91 |
91 |
92 noprefix config and option |
92 noprefix config and option |
93 |
93 |
94 $ hg --config diff.noprefix=True diff --nodates |
94 $ hg --config diff.noprefix=True diff --nodates |
95 diff -r cf9f4ba66af2 a |
95 diff -r cf9f4ba66af2 a |
96 --- a/a |
96 --- a |
97 +++ b/a |
97 +++ a |
98 @@ -2,7 +2,7 @@ |
98 @@ -2,7 +2,7 @@ |
99 c |
99 c |
100 a |
100 a |
101 a |
101 a |
102 -b |
102 -b |
104 a |
104 a |
105 a |
105 a |
106 c |
106 c |
107 $ hg diff --noprefix --nodates |
107 $ hg diff --noprefix --nodates |
108 diff -r cf9f4ba66af2 a |
108 diff -r cf9f4ba66af2 a |
109 --- a/a |
109 --- a |
110 +++ b/a |
110 +++ a |
111 @@ -2,7 +2,7 @@ |
111 @@ -2,7 +2,7 @@ |
112 c |
112 c |
113 a |
113 a |
114 a |
114 a |
115 -b |
115 -b |
133 a |
133 a |
134 a |
134 a |
135 c |
135 c |
136 $ HGPLAIN=1 hg diff --noprefix --nodates |
136 $ HGPLAIN=1 hg diff --noprefix --nodates |
137 diff -r cf9f4ba66af2 a |
137 diff -r cf9f4ba66af2 a |
138 --- a/a |
138 --- a |
139 +++ b/a |
139 +++ a |
140 @@ -2,7 +2,7 @@ |
140 @@ -2,7 +2,7 @@ |
141 c |
141 c |
142 a |
142 a |
143 a |
143 a |
144 -b |
144 -b |
233 |
233 |
234 $ hg --config diff.noprefix=True diff --git --nodates |
234 $ hg --config diff.noprefix=True diff --git --nodates |
235 diff --git a/f1 b/f 1 |
235 diff --git a/f1 b/f 1 |
236 rename from f1 |
236 rename from f1 |
237 rename to f 1 |
237 rename to f 1 |
|
238 --- f1 |
|
239 +++ f 1 |
|
240 @@ -1,1 +1,1 @@ |
|
241 -a |
|
242 +b |
|
243 |
|
244 noprefix config disabled in plain mode, but option still enabled |
|
245 |
|
246 $ HGPLAIN=1 hg --config diff.noprefix=True diff --git --nodates |
|
247 diff --git a/f1 b/f 1 |
|
248 rename from f1 |
|
249 rename to f 1 |
238 --- a/f1 |
250 --- a/f1 |
239 +++ b/f 1 |
251 +++ b/f 1 |
240 @@ -1,1 +1,1 @@ |
252 @@ -1,1 +1,1 @@ |
241 -a |
253 -a |
242 +b |
254 +b |
243 |
|
244 noprefix config disabled in plain mode, but option still enabled |
|
245 |
|
246 $ HGPLAIN=1 hg --config diff.noprefix=True diff --git --nodates |
|
247 diff --git a/f1 b/f 1 |
|
248 rename from f1 |
|
249 rename to f 1 |
|
250 --- a/f1 |
|
251 +++ b/f 1 |
|
252 @@ -1,1 +1,1 @@ |
|
253 -a |
|
254 +b |
|
255 $ HGPLAIN=1 hg diff --git --noprefix --nodates |
255 $ HGPLAIN=1 hg diff --git --noprefix --nodates |
256 diff --git a/f1 b/f 1 |
256 diff --git a/f1 b/f 1 |
257 rename from f1 |
257 rename from f1 |
258 rename to f 1 |
258 rename to f 1 |
259 --- a/f1 |
259 --- f1 |
260 +++ b/f 1 |
260 +++ f 1 |
261 @@ -1,1 +1,1 @@ |
261 @@ -1,1 +1,1 @@ |
262 -a |
262 -a |
263 +b |
263 +b |
264 |
264 |
265 Regular diff --nodates, file deletion |
265 Regular diff --nodates, file deletion |