Merge branch 'rd/man-prune-progress'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"