mergetools / vimdiff2on commit Merge branch 'jk/two-way-merge-corner-case-fix' into maint (4766036)
   1. "$MERGE_TOOLS_DIR/vimdiff"