mergetools / vimdiff2on commit Merge branch 'bg/strbuf-trim' (d6850db)
   1. "$MERGE_TOOLS_DIR/vimdiff"