mergetools / vimdiff3on commit Merge branch 'es/osx-header-pollutes-mask-macro' into maint (3f20927)
   1. "$MERGE_TOOLS_DIR/vimdiff"