mergetools / gvimdiff3on commit Merge branch 'rs/use-strbuf-addstr' (940622b)
   1. "$MERGE_TOOLS_DIR/vimdiff"