view tests/narrow-library.sh @ 40466:b57f2734ac92

test: use the "correct" merge tool in `test-rebase-detach.t` The value of `HGMERGE` overrides the value passed through --config. We are about to drop this `HGMERGE` environment variable so we update the value used in config to match what is currently in use. This is another example of confusion introduced by the `HGMERGE` environment variable.
author Boris Feld <boris.feld@octobus.net>
date Thu, 01 Nov 2018 14:24:34 +0100
parents 2405ca783672
children bcf70058af90
line wrap: on
line source

cat >> $HGRCPATH <<EOF
[extensions]
narrow=
[ui]
ssh=python "$TESTDIR/dummyssh"
[experimental]
changegroup3 = True
EOF