mergetools / gvimdiff2on commit t: prefer "git config --file" to GIT_CONFIG (f7e8714)
   1. "$MERGE_TOOLS_DIR/vimdiff"