mergetools / gvimdiff2on commit Merge branch 'jk/delta-islands-progress-fix' into maint (e591501)
   1. "$MERGE_TOOLS_DIR/vimdiff"