mergetools / gvimdiff2on commit Merge branch 'et/http-proxyauth' (0e521a4)
   1. "$MERGE_TOOLS_DIR/vimdiff"