mergetools / vimdiff2on commit merge-recursive: apply necessary modifications for directory renames (3b9616f)
   1. "$MERGE_TOOLS_DIR/vimdiff"