mergetools / vimdiff2on commit Merge branch 'mh/for-each-string-list-item-empty-fix' into maint (8dc1d0b)
   1. "$MERGE_TOOLS_DIR/vimdiff"