mergetools / gvimdiffon commit Merge branch 'bg/xcalloc-nmemb-then-size' into maint (cfececf)
   1. "$MERGE_TOOLS_DIR/vimdiff"