mergetools / gvimdiff2on commit utf8: add function to align a string into given strbuf (110dcda)
   1. "$MERGE_TOOLS_DIR/vimdiff"