mergetools / gvimdiff2on commit Merge branch 'js/t6042-timing-fix' (3009c8b)
   1. "$MERGE_TOOLS_DIR/vimdiff"