mergetools / vimdiff2on commit Merge branch 'pa/auto-gc-mac-osx' into maint (7c62118)
   1. "$MERGE_TOOLS_DIR/vimdiff"