mergetools / gvimdiff2on commit Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch' (20419de)
   1. "$MERGE_TOOLS_DIR/vimdiff"