mergetools / vimdiff2on commit Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maint (85785df)
   1. "$MERGE_TOOLS_DIR/vimdiff"