Note: make_environment_block()'s code is a little tricky, as the same
deltaenv may very well add *and* remove the same variable.
This patch fixes t7814 when building with MSVC. The breakage was
reported by Ben Peart.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>