mergetools / gvimdiff2on commit Merge branch 'sr/http-proxy-configuration-fix' (6b51cb6)
   1. "$MERGE_TOOLS_DIR/vimdiff"