mergetools / gvimdiffon commit Merge branch 'cb/array-size' into maint (b1f0802)
   1. "$MERGE_TOOLS_DIR/vimdiff"