mergetools / gvimdiff3on commit Merge branch 'rs/export-strbuf-addchars' (56feed1)
   1. "$MERGE_TOOLS_DIR/vimdiff"