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