mergetools / vimdiff2on commit dir: revert work-around for retired dangerous behavior (de372b1)
   1. "$MERGE_TOOLS_DIR/vimdiff"