mergetools / gvimdiffon commit Merge branch 'vn/line-log-memcpy-size-fix' into maint (3d0449d)
   1. "$MERGE_TOOLS_DIR/vimdiff"