mergetools / gvimdiff2on commit strbuf: make stripspace() part of strbuf (63af4a8)
   1. "$MERGE_TOOLS_DIR/vimdiff"