mergetools / vimdiff2on commit Merge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null' into maint (b9efce1)
   1. "$MERGE_TOOLS_DIR/vimdiff"