##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

make mercurial look in more places for config files....
make mercurial look in more places for config files. now it searches <install dir>/etc/mercurial, /etc/mercurial, and user hgrc. this allows site-wide configuration to be shared over automounted nfs partition, instead of chenging on every system. option of having local configuration on every system remains. old code for searching /etc/mercurial/hgrc.d never worked, this code is tested and works.
mpm@selenic.com - - Load All Authors

File last commit:

r925:5a034646 default
r1583:32a4e680 default
Show More
test-merge5.out
5 lines | 170 B | text/plain | TextLexer
/ tests / test-merge5.out
History | Annotation | Raw |Copy content |Copy permalink
removing b
this update spans a branch affecting the following files:
b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)