mergetools / gvimdiff2on commit t7610: unsuppress output (e9d309e)
   1. "$MERGE_TOOLS_DIR/vimdiff"