mergetools / vimdiff2on commit Merge branch 'pe/pull-rebase-v-q' into maint (bcd6608)
   1. "$MERGE_TOOLS_DIR/vimdiff"