mergetools / vimdiff3on commit Merge branch 'rs/merge-microcleanup' into maint (afa6608)
   1. "$MERGE_TOOLS_DIR/vimdiff"