mergetools / gvimdiff2on commit tests: use "env" to run commands with temporary env-var settings (512477b)
   1. "$MERGE_TOOLS_DIR/vimdiff"