mergetools / gvimdiff2on commit Merge branch 'fc/transport-helper-sync-error-fix' (d508e4a)
   1. "$MERGE_TOOLS_DIR/vimdiff"