mergetools / vimdiff2on commit Merge branch 'jk/t6300-cleanup' into maint (7e02ec2)
   1. "$MERGE_TOOLS_DIR/vimdiff"