mergetools / gvimdiffon commit Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch' into maint (1e93c28)
   1. "$MERGE_TOOLS_DIR/vimdiff"