mergetools / vimdiff3on commit Merge branch 'jh/strbuf-read-use-read-in-full' into maint (8b27071)
   1. "$MERGE_TOOLS_DIR/vimdiff"