mergetools / gvimdiff3on commit setup_git_env: avoid blind fall-back to ".git" (b1ef400)
   1. "$MERGE_TOOLS_DIR/vimdiff"