mergetools / vimdiff3on commit Merge branch 'cc/shared-index-permfix' into maint (a9e87e3)
   1. "$MERGE_TOOLS_DIR/vimdiff"