mergetools / gvimdiff2on commit fetch: work around "transport-take-over" hack (b26ed43)
   1. "$MERGE_TOOLS_DIR/vimdiff"