mergetools / vimdiff2on commit Merge branch 'mm/mv-file-to-no-such-dir-with-slash' into maint (ada6ebb)
   1. "$MERGE_TOOLS_DIR/vimdiff"