diff .jshintrc @ 40470:d6b6f1b441cf

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 bdd2e18b54c5
children
line wrap: on
line diff