mergetools / vimdiff2on commit Merge branch 'pb/opt-cmdmode-doc' into maint (48adfa1)
   1. "$MERGE_TOOLS_DIR/vimdiff"