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