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