Merge branch 'ma/diff-doc-clarify-regexp-example' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"