mergetools / vimdiff3on commit Merge branch 'tc/missing-http-proxyauth' (90eea88)
   1. "$MERGE_TOOLS_DIR/vimdiff"