Merge branch 'cn/fetch-prune-overlapping-destination' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"