mergetools / vimdiff2on commit t/helper: merge test-scrap-cache-tree into test-tool (ff5fb8b)
   1. "$MERGE_TOOLS_DIR/vimdiff"