mergetools / vimdiff2on commit Merge branch 'fk/doc-format-patch-vn' into maint (a15ebbc)
   1. "$MERGE_TOOLS_DIR/vimdiff"