mergetools / gvimdiffon commit Merge branch 'ws/curl-http-proxy-over-https' (fc4a226)
   1. "$MERGE_TOOLS_DIR/vimdiff"