Mercurial > hg > mercurial-source

comparison tests/test-commandserver.t @ 41256:d6b6f1b441cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: define the default merge tool through configuration Using the `HGMERGE` environment variable generates confusion as it overrides any value set through configuration. By setting the default value through the default HGRC, the usual overriding rules apply and it should reduce confusion.
author Boris Feld <boris.feld@octobus.net>
date Thu, 01 Nov 2018 14:29:21 +0100
parents 2f1edf5e0a4b
children 054d0fcba2c4
comparison
equal deleted inserted replaced
41255:f8154ddaaed3 41256:d6b6f1b441cf
209 extensions.fsmonitor= (fsmonitor !) 209 extensions.fsmonitor= (fsmonitor !)
210 largefiles.usercache=$TESTTMP/.cache/largefiles 210 largefiles.usercache=$TESTTMP/.cache/largefiles
211 lfs.usercache=$TESTTMP/.cache/lfs 211 lfs.usercache=$TESTTMP/.cache/lfs
212 ui.slash=True 212 ui.slash=True
213 ui.interactive=False 213 ui.interactive=False
214 ui.merge=internal:merge
214 ui.mergemarkers=detailed 215 ui.mergemarkers=detailed
215 ui.foo=bar 216 ui.foo=bar
216 ui.nontty=true 217 ui.nontty=true
217 web.address=localhost 218 web.address=localhost
218 web\.ipv6=(?:True|False) (re) 219 web\.ipv6=(?:True|False) (re)
219 web.server-header=testing stub value 220 web.server-header=testing stub value
220 *** runcommand init foo 221 *** runcommand init foo
221 *** runcommand -R foo showconfig ui defaults 222 *** runcommand -R foo showconfig ui defaults
222 ui.slash=True 223 ui.slash=True
223 ui.interactive=False 224 ui.interactive=False
225 ui.merge=internal:merge
224 ui.mergemarkers=detailed 226 ui.mergemarkers=detailed
225 ui.nontty=true 227 ui.nontty=true
226 #endif 228 #endif
227 229
228 $ rm -R foo 230 $ rm -R foo