mergetools / gvimdiff2on commit Merge branch 'rs/strbuf-remove-fix' into maint (b0af481)
   1. "$MERGE_TOOLS_DIR/vimdiff"