mergetools / gvimdiff2on commit t/helper: merge test-genrandom into test-tool (c680668)
   1. "$MERGE_TOOLS_DIR/vimdiff"