Merge branch 'mm/mv-file-to-no-such-dir-with-slash' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"