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