Merge branch 'yd/doc-merge-annotated-tag' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"