mergetools / vimdiff3on commit Merge branch 'rs/rm-strbuf-optim' into maint (b7fb136)
   1. "$MERGE_TOOLS_DIR/vimdiff"