comparison tests/test-hgrc.t @ 20306:fe8e254c7ad6 stable

merge default into stable for 2.9 code freeze
author Matt Mackall <mpm@selenic.com>
date Tue, 21 Jan 2014 14:30:06 -0600
parents 9c963a43ecfb
children f144928dd058
comparison
equal deleted inserted replaced
20213:8c69c69dbcd2 20306:fe8e254c7ad6
56 $ echo '%include $FAKEPATH/no-such-file' > $HGRC 56 $ echo '%include $FAKEPATH/no-such-file' > $HGRC
57 $ hg version 57 $ hg version
58 Mercurial Distributed SCM (version *) (glob) 58 Mercurial Distributed SCM (version *) (glob)
59 (see http://mercurial.selenic.com for more information) 59 (see http://mercurial.selenic.com for more information)
60 60
61 Copyright (C) 2005-2013 Matt Mackall and others 61 Copyright (C) 2005-2014 Matt Mackall and others
62 This is free software; see the source for copying conditions. There is NO 62 This is free software; see the source for copying conditions. There is NO
63 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 63 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
64 $ unset FAKEPATH 64 $ unset FAKEPATH
65 65
66 make sure global options given on the cmdline take precedence 66 make sure global options given on the cmdline take precedence