mergetools / gvimdiffon commit Revert "test-lib: whitelist GIT_TR2_* in the environment" (3efa1c6)
   1. "$MERGE_TOOLS_DIR/vimdiff"