equal
deleted
inserted
replaced
212 ui.slash=True |
212 ui.slash=True |
213 ui.interactive=False |
213 ui.interactive=False |
214 ui.detailed-exit-code=True |
214 ui.detailed-exit-code=True |
215 ui.merge=internal:merge |
215 ui.merge=internal:merge |
216 ui.mergemarkers=detailed |
216 ui.mergemarkers=detailed |
|
217 ui.timeout.warn=15 |
217 ui.foo=bar |
218 ui.foo=bar |
218 ui.nontty=true |
219 ui.nontty=true |
219 web.address=localhost |
220 web.address=localhost |
220 web\.ipv6=(?:True|False) (re) |
221 web\.ipv6=(?:True|False) (re) |
221 web.server-header=testing stub value |
222 web.server-header=testing stub value |
224 ui.slash=True |
225 ui.slash=True |
225 ui.interactive=False |
226 ui.interactive=False |
226 ui.detailed-exit-code=True |
227 ui.detailed-exit-code=True |
227 ui.merge=internal:merge |
228 ui.merge=internal:merge |
228 ui.mergemarkers=detailed |
229 ui.mergemarkers=detailed |
|
230 ui.timeout.warn=15 |
229 ui.nontty=true |
231 ui.nontty=true |
230 #endif |
232 #endif |
231 |
233 |
232 $ rm -R foo |
234 $ rm -R foo |
233 |
235 |