Merge branch 'nd/fetch-pack-shallow-fix' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"