Merge branch 'me/fetch-into-shallow-safety' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"