mergetools / vimdiff2on commit directory rename detection: tests for handling overwriting untracked files (1619442)
   1. "$MERGE_TOOLS_DIR/vimdiff"