Merge branch 'sb/clone-shallow-passthru' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"