mergetools / vimdiff2on commit transport-helper: ask the helper to set the same options for import as for fetch (aab1beb)
   1. "$MERGE_TOOLS_DIR/vimdiff"