Merge branch 'fk/doc-format-patch-vn' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"