mergetools / gvimdiffon commit Merge branch 'rs/use-strbuf-addstr' into maint (574a31b)
   1. "$MERGE_TOOLS_DIR/vimdiff"