mergetools / gvimdiff3on commit Merge branch 'kf/http-proxy-auth-methods' (30f302f)
   1. "$MERGE_TOOLS_DIR/vimdiff"